X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fanalyser.cc;h=bf98ecc20ab406a30c5e675c0c9ecb6337914202;hb=aa0effb4cb38f4c3a06564bd9e6a0ee516d4f958;hp=992e5c52467f55ecc540f911cc6c623849064378;hpb=c38e02285fda1fd7966c9e4ad85994445247e6a6;p=ardour.git

diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc
index 992e5c5246..bf98ecc20a 100644
--- a/libs/ardour/analyser.cc
+++ b/libs/ardour/analyser.cc
@@ -22,17 +22,13 @@
 #include "ardour/session_event.h"
 #include "ardour/transient_detector.h"
 
-#include "pbd/pthread_utils.h"
-#include "pbd/convert.h"
-
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 
 Analyser* Analyser::the_analyser = 0;
-Glib::StaticMutex Analyser::analysis_queue_lock = GLIBMM_STATIC_MUTEX_INIT;
-Glib::Cond* Analyser::SourcesToAnalyse = 0;
+Glib::Threads::Mutex Analyser::analysis_queue_lock;
+Glib::Threads::Cond  Analyser::SourcesToAnalyse;
 list<boost::weak_ptr<Source> > Analyser::analysis_queue;
 
 Analyser::Analyser ()
@@ -53,8 +49,7 @@ analyser_work ()
 void
 Analyser::init ()
 {
-	SourcesToAnalyse = new Glib::Cond();
-	Glib::Thread::create (sigc::ptr_fun (analyser_work), false);
+	Glib::Threads::Thread::create (sigc::ptr_fun (analyser_work));
 }
 
 void
@@ -68,9 +63,9 @@ Analyser::queue_source_for_analysis (boost::shared_ptr<Source> src, bool force)
 		return;
 	}
 
-	Glib::Mutex::Lock lm (analysis_queue_lock);
+	Glib::Threads::Mutex::Lock lm (analysis_queue_lock);
 	analysis_queue.push_back (boost::weak_ptr<Source>(src));
-	SourcesToAnalyse->broadcast ();
+	SourcesToAnalyse.broadcast ();
 }
 
 void
@@ -83,7 +78,7 @@ Analyser::work ()
 
 	  wait:
 		if (analysis_queue.empty()) {
-			SourcesToAnalyse->wait (analysis_queue_lock);
+			SourcesToAnalyse.wait (analysis_queue_lock);
 		}
 
 		if (analysis_queue.empty()) {