strip silence: report analysis progress

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index c32a70ffd865d1bba40b89093ce5c6531a5b64aa..71d25d648e8807e8e5be4e4be1e21dc4f4f5340c 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -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);
 
@@ -107,7 +109,9 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        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 ());
@@ -119,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 ();
 
@@ -133,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)
 {
@@ -150,6 +170,10 @@ StripSilenceDialog::drop_rects ()
 
        _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 ();
        }
@@ -186,6 +210,7 @@ StripSilenceDialog::update ()
        update_threshold_line ();
        update_silence_rects ();
        _progress_bar.set_text ("");
+       update_progress_gui (0);
        apply_button->set_sensitive(true);
 }
 
@@ -218,6 +243,8 @@ StripSilenceDialog::detection_thread_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());
 
@@ -228,8 +255,13 @@ StripSilenceDialog::detection_thread_work ()
                        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 */
                }
@@ -261,6 +293,7 @@ StripSilenceDialog::restart_thread ()
        }
 
        _progress_bar.set_text (_("Analyzing"));
+       update_progress_gui (0);
        apply_button->set_sensitive (false);
 
        /* Cancel any current run */

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 44f5409754a4d779886165ffd266d3583d8ec485..7445b723277586767b28bff38bf3820839fed10d 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -89,4 +89,9 @@ private:
        PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed
        PBD::ScopedConnection _completed_connection;
        ARDOUR::InterThreadInfo _interthread_info;
+
+       sigc::connection progress_idle_connection;
+       bool idle_update_progress(); ///< GUI-thread progress updates of background silence computation
+       int analysis_progress_cur;
+       int analysis_progress_max;
 };