mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-06 00:55:30 +00:00
Code Issues Projects Releases Wiki Activity

Rename USE_THREADS to PROJECTM_USE_THREADS and export it in the package config file.

Browse Source 
PROJECTM_USE_THREADS is only exported if ENABLE_CXX_INTERFACE is ON.
This commit is contained in:
Kai Blaschke
2023-01-24 17:56:12 +01:00
parent 97519a81e6
commit bcaf98f2f1
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libprojectM/ProjectM.cpp
View File

@ -30,7 +30,7 @@
#include "Renderer/PipelineContext.hpp"
#include "TimeKeeper.hpp"
#if USE_THREADS
#if PROJECTM_USE_THREADS
#include "libprojectM/BackgroundWorker.hpp"
@ -40,7 +40,7 @@ ProjectM::ProjectM()
: m_presetFactoryManager(std::make_unique<PresetFactoryManager>())
, m_pipelineContext(std::make_unique<class PipelineContext>())
, m_pipelineContext2(std::make_unique<class PipelineContext>())
#if USE_THREADS
#if PROJECTM_USE_THREADS
, m_workerSync(std::make_unique<BackgroundWorkerSync>())
#endif
{
@ -49,7 +49,7 @@ ProjectM::ProjectM()
ProjectM::~ProjectM()
{
#if USE_THREADS
#if PROJECTM_USE_THREADS
m_workerSync->FinishUp();
m_workerThread.join();
#endif
@ -120,7 +120,7 @@ void ProjectM::DumpDebugImageOnNextFrame()
m_renderer->writeNextFrameToFile = true;
}
#if USE_THREADS
#if PROJECTM_USE_THREADS
void ProjectM::ThreadWorker()
{
@ -166,7 +166,7 @@ void ProjectM::RenderFrame()
auto ProjectM::RenderFrameOnlyPass1(Pipeline* pipeline) -> Pipeline*
{
#if USE_THREADS
#if PROJECTM_USE_THREADS
std::lock_guard<std::recursive_mutex> guard(m_presetSwitchMutex);
#endif
@ -202,7 +202,7 @@ auto ProjectM::RenderFrameOnlyPass1(Pipeline* pipeline) -> Pipeline*
if (m_timeKeeper->IsSmoothing() && m_transitioningPreset != nullptr)
{
#if USE_THREADS
#if PROJECTM_USE_THREADS
m_workerSync->WakeUpBackgroundTask();
// FIXME: Instead of waiting after a single render pass, check every frame if it's done.
m_workerSync->WaitForBackgroundTaskToFinish();
@ -310,7 +310,7 @@ void ProjectM::Initialize()
ResetEngine();
LoadIdlePreset();
#if USE_THREADS
#if PROJECTM_USE_THREADS
m_workerSync->Reset();
m_workerThread = std::thread(&ProjectM::ThreadWorker, this);
#endif