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

Fix git (#278)

Browse Source 
* presets: remove problematic community presets

* Breaks a lot of things including test apps and kodi addon.
  Link is provided in README.md for those who want it

Signed-off-by: Matt Filetto <matt.filetto@gmail.com>

* fix for freeze (issue 243) (#276)
This commit is contained in:
Matt Filetto
2019-11-15 21:13:03 -08:00
committed by Mischa Spiegelmock
parent 9ea9a7cc4e
commit 0ffad4dc4e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libprojectM/BackgroundWorker.h
View File

@ -26,6 +26,12 @@ public:
pthread_cond_init(&condition_work_done, NULL);
}
void reset()
{
there_is_work_to_do = false;
finished = false;
}
// called by foreground
void wake_up_bg()
{
@ -44,7 +50,7 @@ public:
pthread_mutex_unlock(&mutex);
}
// called by foreground()
// called by foreground() when shutting down, background thread should exit
void finish_up()
{
pthread_mutex_lock(&mutex);

6
src/libprojectM/projectM.cpp
View File

@ -71,16 +71,11 @@ projectM::~projectM()
{
#ifdef USE_THREADS
void *status;
std::cout << "[projectM] thread ";
printf("cl");
worker_sync.finish_up();
printf("e");
pthread_join(thread, &status);
printf("n");
#ifdef SYNC_PRESET_SWITCHES
pthread_mutex_destroy( &preset_mutex );
#endif
printf("up");
std::cout << std::endl;
#endif
destroyPresetTools();
@ -567,6 +562,7 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
pthread_mutex_init(&preset_mutex, NULL);
#endif
worker_sync.reset();
if (pthread_create(&thread, NULL, thread_callback, this) != 0)
{