Properly revert FormatSpec changes on "cancel"

[ardour.git] / gtk2_ardour / strip_silence_dialog.cc

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index c32a70ffd865d1bba40b89093ce5c6531a5b64aa..a2f8bc7983001ff6e72b4a7fd4215378b8f228bc 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -21,10 +21,12 @@
 
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/stock.h>
 
 #include "ardour/audioregion.h"
 #include "ardour/dB.h"
+#include "ardour/logmeter.h"
 #include "ardour_ui.h"
 
 #include "audio_clock.h"
@@ -32,8 +34,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 +47,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 +65,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);
@@ -76,7 +79,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        ++n;
 
        _minimum_length->set_session (s);
-       _minimum_length->set_mode (AudioClock::Frames);
+       _minimum_length->set_mode (AudioClock::Samples);
        _minimum_length->set (1000, true);
 
        table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
@@ -84,7 +87,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        ++n;
 
        _fade_length->set_session (s);
-       _fade_length->set_mode (AudioClock::Frames);
+       _fade_length->set_mode (AudioClock::Samples);
        _fade_length->set (64, true);
 
        hbox->pack_start (*table);
@@ -107,7 +110,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 +124,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 +139,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,8 +171,12 @@ 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 ();
+               v->view->drop_silent_samples ();
        }
 
        cancel_button->set_sensitive (false);
@@ -186,6 +211,7 @@ StripSilenceDialog::update ()
        update_threshold_line ();
        update_silence_rects ();
        _progress_bar.set_text ("");
+       update_progress_gui (0);
        apply_button->set_sensitive(true);
 }
 
@@ -197,7 +223,7 @@ StripSilenceDialog::update_silence_rects ()
        double const y = _threshold.get_value();
 
        for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
-               v->view->set_silent_frames (v->intervals, y);
+               v->view->set_silent_samples (v->intervals, y);
        }
 }
 
@@ -212,12 +238,17 @@ 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());
 
@@ -228,8 +259,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 +297,7 @@ StripSilenceDialog::restart_thread ()
        }
 
        _progress_bar.set_text (_("Analyzing"));
+       update_progress_gui (0);
        apply_button->set_sensitive (false);
 
        /* Cancel any current run */
@@ -283,16 +320,16 @@ StripSilenceDialog::threshold_changed ()
        restart_thread ();
 }
 
-framecnt_t
+samplecnt_t
 StripSilenceDialog::minimum_length () const
 {
-       return std::max((framecnt_t)1, _minimum_length->current_duration (views.front().view->region()->position()));
+       return std::max((samplecnt_t)1, _minimum_length->current_duration (views.front().view->region()->position()));
 }
 
-framecnt_t
+samplecnt_t
 StripSilenceDialog::fade_length () const
 {
-       return std::max((framecnt_t)0, _fade_length->current_duration (views.front().view->region()->position()));
+       return std::max((samplecnt_t)0, _fade_length->current_duration (views.front().view->region()->position()));
 }
 
 void