diff --git a/app/render/rendermanager.cpp b/app/render/rendermanager.cpp index 43acad8c3..e779820ff 100644 --- a/app/render/rendermanager.cpp +++ b/app/render/rendermanager.cpp @@ -35,10 +35,12 @@ #include "window/mainwindow/mainwindow.h" namespace olive { + RenderManager* RenderManager::instance_ = nullptr; RenderManager::RenderManager(QObject *parent) : - ThreadPool(0, parent), backend_(kOpenGL) + ThreadPool(0, parent), + backend_(kOpenGL) { Renderer* graphics_renderer = nullptr; diff --git a/app/threading/threadpool.cpp b/app/threading/threadpool.cpp index 017d811ba..24a90bf1d 100644 --- a/app/threading/threadpool.cpp +++ b/app/threading/threadpool.cpp @@ -34,7 +34,8 @@ ThreadPool::ThreadPool(unsigned threads, QObject *parent) } } -void ThreadPool::AddTicket(RenderTicketPtr ticket, RenderTicketPriority priority) { +void ThreadPool::AddTicket(RenderTicketPtr ticket, RenderTicketPriority priority) +{ std::lock_guard lock(task_mutex_); if (priority == RenderTicketPriority::kHigh) { @@ -59,7 +60,8 @@ bool ThreadPool::RemoveTicket(RenderTicketPtr ticket) return true; } -void ThreadPool::thread_exec() { +void ThreadPool::thread_exec() +{ while (true) { TaskType task; diff --git a/app/threading/threadpool.h b/app/threading/threadpool.h index 0be4b30ef..7a7ea12df 100644 --- a/app/threading/threadpool.h +++ b/app/threading/threadpool.h @@ -59,6 +59,7 @@ private: std::mutex task_mutex_; std::condition_variable cond_; std::atomic_bool end_threadp_{false}; + }; } // namespace olive