X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fanalyser.cc;h=457291f72f51071f3cbc567fbe0bfe167d89e5eb;hb=1389fa9e2246a1b7faf193932a7c3ca4ba559c64;hp=730ea4169ad73d234759267b1e1323cfd26de3c5;hpb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;p=ardour.git

diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc
index 730ea4169a..457291f72f 100644
--- a/libs/ardour/analyser.cc
+++ b/libs/ardour/analyser.cc
@@ -19,16 +19,22 @@
 
 #include "ardour/analyser.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session_event.h"
 #include "ardour/transient_detector.h"
 
+#include "pbd/compose.h"
+#include "pbd/error.h"
+#include "pbd/i18n.h"
+
 using namespace std;
 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_active_lock;
+Glib::Threads::Mutex Analyser::analysis_queue_lock;
+Glib::Threads::Cond  Analyser::SourcesToAnalyse;
 list<boost::weak_ptr<Source> > Analyser::analysis_queue;
 
 Analyser::Analyser ()
@@ -49,8 +55,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
@@ -64,9 +69,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
@@ -79,7 +84,7 @@ Analyser::work ()
 
 	  wait:
 		if (analysis_queue.empty()) {
-			SourcesToAnalyse->wait (analysis_queue_lock);
+			SourcesToAnalyse.wait (analysis_queue_lock);
 		}
 
 		if (analysis_queue.empty()) {
@@ -93,6 +98,7 @@ Analyser::work ()
 		boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src);
 
 		if (afs && afs->length(afs->timeline_position())) {
+			Glib::Threads::Mutex::Lock lm (analysis_active_lock);
 			analyse_audio_file_source (afs);
 		}
 	}
@@ -103,13 +109,25 @@ Analyser::analyse_audio_file_source (boost::shared_ptr<AudioFileSource> src)
 {
 	AnalysisFeatureList results;
 
-	TransientDetector td (src->sample_rate());
-
-	if (td.run (src->get_transients_path(), src.get(), 0, results) == 0) {
-		src->set_been_analysed (true);
-	} else {
+	try {
+		TransientDetector td (src->sample_rate());
+		td.set_sensitivity (3, Config->get_transient_sensitivity()); // "General purpose"
+		if (td.run (src->get_transients_path(), src.get(), 0, results) == 0) {
+			src->set_been_analysed (true);
+		} else {
+			src->set_been_analysed (false);
+		}
+	} catch (...) {
+		error << string_compose(_("Transient Analysis failed for %1."), _("Audio File Source")) << endmsg;;
 		src->set_been_analysed (false);
+		return;
 	}
-
 }
 
+void
+Analyser::flush ()
+{
+	Glib::Threads::Mutex::Lock lq (analysis_queue_lock);
+	Glib::Threads::Mutex::Lock la (analysis_active_lock);
+	analysis_queue.clear();
+}