X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.cc;h=5fa115d69265d9655ddc1d8978a4d09d5f733971;hb=e54413ee46831252286ecfd12775236c439d9d44;hp=7d07a0ba3b382aad8a6ecf79bcafe8b852912e50;hpb=21c1d0f8323b27cb664165cb22f1828a8aad5c23;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 7d07a0ba3b..5fa115d692 100644
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -25,6 +25,7 @@
 
 #include "ardour/audioregion.h"
 #include "ardour/dB.h"
+#include "ardour/logmeter.h"
 #include "ardour_ui.h"
 
 #include "audio_clock.h"
@@ -32,8 +33,7 @@
 #include "strip_silence_dialog.h"
 #include "region_view.h"
 #include "rgb_macros.h"
-#include "i18n.h"
-#include "logmeter.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -46,6 +46,8 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 	, _minimum_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
 	, _fade_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
 	, _destroying (false)
+	, analysis_progress_cur (0)
+	, analysis_progress_max (0)
 {
 	set_session (s);
 
@@ -62,7 +64,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 
 	table->attach (*Gtk::manage (new Gtk::Label (_("Threshold"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
 	table->attach (_threshold, 1, 2, n, n + 1, Gtk::FILL);
-	table->attach (*Gtk::manage (new Gtk::Label (_("dbFS"))), 2, 3, n, n + 1, Gtk::FILL);
+	table->attach (*Gtk::manage (new Gtk::Label (_("dBFS"))), 2, 3, n, n + 1, Gtk::FILL);
 	++n;
 
 	_threshold.set_digits (1);
@@ -101,10 +103,16 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 
 	_threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::threshold_changed));
 	_minimum_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread));
+	_fade_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread));
 
 	update_silence_rects ();
 	update_threshold_line ();
 
+	_progress_bar.set_text (_("Analyzing"));
+	update_progress_gui (0);
+	apply_button->set_sensitive (false);
+	progress_idle_connection = Glib::signal_idle().connect (sigc::mem_fun (*this, &StripSilenceDialog::idle_update_progress));
+
 	/* Create a thread which runs while the dialogue is open to compute the silence regions */
 	Completed.connect (_completed_connection, invalidator(*this), boost::bind (&StripSilenceDialog::update, this), gui_context ());
 	_thread_should_finish = false;
@@ -115,10 +123,11 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 StripSilenceDialog::~StripSilenceDialog ()
 {
 	_destroying = true;
+	progress_idle_connection.disconnect();
 
 	/* Terminate our thread */
-	_lock.lock ();
 	_interthread_info.cancel = true;
+	_lock.lock ();
 	_thread_should_finish = true;
 	_lock.unlock ();
 
@@ -129,6 +138,21 @@ StripSilenceDialog::~StripSilenceDialog ()
 	delete _fade_length;
 }
 
+bool
+StripSilenceDialog::idle_update_progress()
+{
+	if (analysis_progress_max > 0) {
+		// AudioRegion::find_silence() has
+		// itt.progress = (end - pos) / length
+		// not sure if that's intentional, but let's use (1. - val)
+		float rp = std::min(1.f, std::max (0.f, (1.f - _interthread_info.progress)));
+		float p = analysis_progress_cur / (float) analysis_progress_max
+		        + rp / (float) analysis_progress_max;
+		update_progress_gui (p);
+	}
+	return !_destroying;
+}
+
 void
 StripSilenceDialog::silences (AudioIntervalMap& m)
 {
@@ -144,6 +168,12 @@ StripSilenceDialog::drop_rects ()
 	// called by parent when starting to progess (dialog::run returned),
 	// but before the dialog is destoyed.
 
+	_interthread_info.cancel = true;
+
+	/* Block until the thread is idle */
+	_lock.lock ();
+	_lock.unlock ();
+
 	for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
 		v->view->drop_silent_frames ();
 	}
@@ -179,6 +209,9 @@ StripSilenceDialog::update ()
 {
 	update_threshold_line ();
 	update_silence_rects ();
+	_progress_bar.set_text ("");
+	update_progress_gui (0);
+	apply_button->set_sensitive(true);
 }
 
 void
@@ -204,24 +237,34 @@ StripSilenceDialog::_detection_thread_work (void* arg)
 void *
 StripSilenceDialog::detection_thread_work ()
 {
-	ARDOUR_UI::instance()->register_thread ("gui", pthread_self(), "silence", 32);
+	/* Do not register with all UIs, but do register with the GUI,
+	   because we will need to queue some GUI (only) requests
+	*/
+	ARDOUR_UI::instance()->register_thread (pthread_self(), "silence", 32);
 
 	/* Hold this lock when we are doing work */
 	_lock.lock ();
 
 	while (1) {
+		analysis_progress_cur = 0;
+		analysis_progress_max = views.size();
 		for (list<ViewInterval>::iterator i = views.begin(); i != views.end(); ++i) {
 			boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> ((*i).view->region());
 
 			if (ar) {
-				i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info);
+				i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), fade_length(), _interthread_info);
 			}
 
 			if (_interthread_info.cancel) {
 				break;
 			}
+			++analysis_progress_cur;
+			_interthread_info.progress = 1.0;
+			ARDOUR::GUIIdle ();
 		}
 
+		analysis_progress_max = 0;
+
 		if (!_interthread_info.cancel) {
 			Completed (); /* EMIT SIGNAL */
 		}
@@ -252,6 +295,10 @@ StripSilenceDialog::restart_thread ()
 		return;
 	}
 
+	_progress_bar.set_text (_("Analyzing"));
+	update_progress_gui (0);
+	apply_button->set_sensitive (false);
+
 	/* Cancel any current run */
 	_interthread_info.cancel = true;