X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fanalyser.cc;h=457291f72f51071f3cbc567fbe0bfe167d89e5eb;hb=fb01698450e5cb88c7e58fb3a5ebe6294731fdfe;hp=bf98ecc20ab406a30c5e675c0c9ecb6337914202;hpb=3cd8138a419cb165f56070ace0b21a1e63ec5a43;p=ardour.git

diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc
index bf98ecc20a..457291f72f 100644
--- a/libs/ardour/analyser.cc
+++ b/libs/ardour/analyser.cc
@@ -19,14 +19,20 @@
 
 #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::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;
@@ -92,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);
 		}
 	}
@@ -102,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();
+}