From 22e96e5301bf86a930f6b7d00515a72a077b4574 Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Sun, 29 Nov 2009 15:55:51 +0000
Subject: [PATCH] preset lock

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1304 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/libprojectM/projectM.cpp | 45 ++++++++++++++++++------------------
 src/libprojectM/projectM.hpp |  4 ----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
index 68a1e1f36..998a90354 100755
--- a/src/libprojectM/projectM.cpp
+++ b/src/libprojectM/projectM.cpp
@@ -57,7 +57,13 @@
 #include "RenderItemMergeFunction.hpp"
 #ifdef USE_THREADS
 #include "pthread.h"
+
+#ifdef SYNC_PRESET_SWITCHES
+pthread_mutex_t preset_mutex;
 #endif
+#endif
+
+
 
 projectM::~projectM()
 {
@@ -77,7 +83,7 @@ projectM::~projectM()
     printf("u");
     pthread_mutex_destroy( &mutex );
     #ifdef SYNC_PRESET_SWITCHES
-    //pthread_mutex_destroy( &mutex );
+    pthread_mutex_destroy( &preset_mutex );
     #endif
 
     printf("p");
@@ -292,7 +298,10 @@ static void *thread_callback(void *prjm) {
 
     void projectM::renderFrame()
     {
-
+        #ifdef SYNC_PRESET_SWITCHES
+        pthread_mutex_lock(&preset_mutex);       
+        #endif 
+      
         #ifdef DEBUG
         char fname[1024];
         FILE *f = NULL;
@@ -358,9 +367,6 @@ static void *thread_callback(void *prjm) {
             assert ( m_activePreset2.get() );
 
             #ifdef USE_THREADS
-	    #ifdef SYNC_PRESET_SWITCHES
-    	    //pthread_mutex_lock(&mutex);
-	    #endif
 
             pthread_cond_signal(&condition);
             pthread_mutex_unlock( &mutex );
@@ -386,9 +392,7 @@ static void *thread_callback(void *prjm) {
             renderer->RenderFrame(pipeline, pipelineContext());
 
 	    pipeline.drawables.clear();
-	    #ifdef SYNC_PRESET_SWITCHES
-    	    //pthread_mutex_unlock(&mutex);
-	    #endif
+
 	    /*		
 	    while (!pipeline.drawables.empty()) {
 		delete(pipeline.drawables.back());
@@ -398,9 +402,7 @@ static void *thread_callback(void *prjm) {
         }
         else
         {
-	    #ifdef SYNC_PRESET_SWITCHES
-	    pthread_mutex_lock(&mutex);
-	    #endif
+
 
             if ( timeKeeper->IsSmoothing() && timeKeeper->SmoothRatio() > 1.0 )
             {
@@ -413,9 +415,7 @@ static void *thread_callback(void *prjm) {
             m_activePreset->Render(*beatDetect, pipelineContext());
             renderer->RenderFrame (m_activePreset->pipeline(), pipelineContext());
 
-	    #ifdef SYNC_PRESET_SWITCHES
-            pthread_mutex_unlock(&mutex);
-	    #endif 
+
         }
 
         //	std::cout<< m_activePreset->absoluteFilePath()<<std::endl;
@@ -447,7 +447,9 @@ static void *thread_callback(void *prjm) {
         this->timestart=getTicks ( &timeKeeper->startTime );
         #endif /** !WIN32 */
 
-	
+	#ifdef SYNC_PRESET_SWITCHES
+        pthread_mutex_unlock(&preset_mutex);        
+        #endif 
 	
     }
 
@@ -493,8 +495,9 @@ static void *thread_callback(void *prjm) {
 
         #ifdef USE_THREADS
         pthread_mutex_init(&mutex, NULL);
+        
 	#ifdef SYNC_PRESET_SWITCHES
-	//pthread_mutex_init(&mutex, NULL);
+        pthread_mutex_init(&preset_mutex, NULL);        
 	#endif
 
         pthread_cond_init(&condition, NULL);
@@ -780,11 +783,8 @@ void projectM::selectNext(const bool hardCut) {
  */
 void projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
 
-	#ifdef SYNC_PRESET_SWITCHES
-	std::cout << "[switch preset] acquiring lock" << std::endl;
-	
-	pthread_mutex_lock(&mutex);
-	std::cout << "[switch preset] lock acquired" << std::endl;
+	#ifdef SYNC_PRESET_SWITCHES	
+	pthread_mutex_lock(&preset_mutex);	
 	#endif 
 
         targetPreset = m_presetPos->allocate();
@@ -794,8 +794,7 @@ void projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
         renderer->SetPipeline(targetPreset->pipeline());
 
 	#ifdef SYNC_PRESET_SWITCHES	
-	pthread_mutex_unlock(&mutex);
-	std::cout << "[switch preset] lock released" << std::endl;
+	pthread_mutex_unlock(&preset_mutex);	
 	#endif 
     }
 
diff --git a/src/libprojectM/projectM.hpp b/src/libprojectM/projectM.hpp
index 3acec95da..ae3f6e4f4 100755
--- a/src/libprojectM/projectM.hpp
+++ b/src/libprojectM/projectM.hpp
@@ -315,10 +315,6 @@ private:
   MasterRenderItemMerge * _merger;
   pthread_mutex_t mutex;
 
-  #ifdef SYNC_PRESET_SWITCHES
-  pthread_mutex_t preset_switch_mutex;
-  #endif
-
   pthread_cond_t  condition;
   pthread_t thread;
   bool running;