final tweaks for #4489

[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 daa540d0393ac5cbf08ba0551cb926b5c0819bbc..6a6c6fc0d778d4b23258193dd35a9e61cd48668b 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -29,6 +29,7 @@
 #include "ardour_ui.h"
 #include "ardour/session.h"
 
+#include "audio_clock.h"
 #include "gui_thread.h"
 #include "strip_silence_dialog.h"
 #include "canvas_impl.h"
@@ -48,8 +49,8 @@ using namespace ArdourCanvas;
 StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        : ArdourDialog (_("Strip Silence"))
        , ProgressReporter ()
-        , _minimum_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false)
-        , _fade_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false)
+        , _minimum_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
+        , _fade_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
        , _peaks_ready_connection (0)
        , _destroying (false)
 {
@@ -60,7 +61,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
         }
 
        Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox);
-        
+
        Gtk::Table* table = Gtk::manage (new Gtk::Table (3, 3));
        table->set_spacings (6);
 
@@ -70,30 +71,28 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        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);
        ++n;
-        
+
        _threshold.set_digits (1);
        _threshold.set_increments (1, 10);
        _threshold.set_range (-120, 0);
        _threshold.set_value (-60);
+       _threshold.set_activates_default ();
 
        table->attach (*Gtk::manage (new Gtk::Label (_("Minimum length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
-       table->attach (_minimum_length, 1, 2, n, n + 1, Gtk::FILL);
+       table->attach (*_minimum_length, 1, 2, n, n + 1, Gtk::FILL);
        ++n;
-       
-        _minimum_length.set_session (s);
-        _minimum_length.set_mode (AudioClock::Frames);
-        _minimum_length.set (1000, true);
 
-        /* Add this back when we finally do something with it */
-        /*
+        _minimum_length->set_session (s);
+        _minimum_length->set_mode (AudioClock::Frames);
+        _minimum_length->set (1000, true);
+
        table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
-        table->attach (_fade_length, 1, 2, n, n + 1, Gtk::FILL);
+        table->attach (*_fade_length, 1, 2, n, n + 1, Gtk::FILL);
        ++n;
-        */
 
-        _fade_length.set_session (s);
-        _fade_length.set_mode (AudioClock::Frames);
-        _fade_length.set (64, true);
+        _fade_length->set_session (s);
+        _fade_length->set_mode (AudioClock::Frames);
+        _fade_length->set (64, true);
 
        hbox->pack_start (*table);
 
@@ -101,13 +100,14 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 
        add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
        add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_OK);
+       set_default_response (Gtk::RESPONSE_OK);
 
        get_vbox()->pack_start (_progress_bar, true, true, 12);
 
        show_all ();
 
         _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));
+        _minimum_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread));
 
        update_silence_rects ();
        update_threshold_line ();
@@ -122,9 +122,9 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 StripSilenceDialog::~StripSilenceDialog ()
 {
        _destroying = true;
-       
+
        /* Terminate our thread */
-       
+
        _lock.lock ();
        _interthread_info.cancel = true;
        _thread_should_finish = true;
@@ -132,7 +132,10 @@ StripSilenceDialog::~StripSilenceDialog ()
 
        _run_cond.signal ();
        pthread_join (_thread, 0);
-       
+
+       delete _minimum_length;
+       delete _fade_length;
+
        delete _peaks_ready_connection;
 }
 
@@ -140,7 +143,7 @@ void
 StripSilenceDialog::silences (AudioIntervalMap& m)
 {
         for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
-                pair<boost::shared_ptr<Region>,AudioIntervalResult> newpair ((*v).view->region(), (*v).intervals);
+                pair<boost::shared_ptr<Region>,AudioIntervalResult> newpair (v->view->region(), v->intervals);
                 m.insert (newpair);
         }
 }
@@ -149,7 +152,7 @@ void
 StripSilenceDialog::drop_rects ()
 {
         for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
-                (*v).view->drop_silent_frames ();
+                v->view->drop_silent_frames ();
         }
 }
 
@@ -164,7 +167,7 @@ StripSilenceDialog::update_threshold_line ()
        for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
                (*i)->threshold_line->property_x1() = 0;
                (*i)->threshold_line->property_x2() = _wave_width;
-               
+
                double const y = alt_log_meter (_threshold.get_value());
 
                (*i)->threshold_line->property_y1() = (n + 1 - y) * _wave_height;
@@ -190,7 +193,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_frames (v->intervals, y);
        }
 }
 
@@ -209,13 +212,13 @@ StripSilenceDialog::detection_thread_work ()
 
        /* Hold this lock when we are doing work */
        _lock.lock ();
-       
+
        while (1) {
                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 (), _interthread_info);
                         }
 
                        if (_interthread_info.cancel) {
@@ -252,7 +255,7 @@ StripSilenceDialog::restart_thread ()
                */
                return;
        }
-       
+
        /* Cancel any current run */
        _interthread_info.cancel = true;
 
@@ -276,15 +279,15 @@ StripSilenceDialog::threshold_changed ()
 framecnt_t
 StripSilenceDialog::minimum_length () const
 {
-        return _minimum_length.current_duration (views.front().view->region()->position());
+        return _minimum_length->current_duration (views.front().view->region()->position());
 }
 
 framecnt_t
 StripSilenceDialog::fade_length () const
 {
-        return _minimum_length.current_duration (views.front().view->region()->position());
+        return _fade_length->current_duration (views.front().view->region()->position());
 }
-               
+
 void
 StripSilenceDialog::update_progress_gui (float p)
 {