X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.cc;h=d37fbb6585ebea29391b61f5ab9e89e47d25668a;hb=b49e3982502f5e483422960dc11be967d7c790f4;hp=5863d7cde56d450cb5dc76ca593b737b9fbac171;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 5863d7cde5..d37fbb6585 100644
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -22,20 +22,15 @@
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 
+#include "ardour/audioregion.h"
 #include "ardour/dB.h"
 #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"
 #include "region_view.h"
-#include "simpleline.h"
-#include "waveview.h"
-#include "simplerect.h"
 #include "rgb_macros.h"
 #include "i18n.h"
 #include "logmeter.h"
@@ -48,8 +43,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)
 {
@@ -75,22 +70,23 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 	_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);
+        _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);
 
@@ -98,19 +94,20 @@ 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 ();
 
 	/* Create a thread which runs while the dialogue is open to compute the silence regions */
-	Completed.connect (_completed_connection, MISSING_INVALIDATOR, ui_bind (&StripSilenceDialog::update, this), gui_context ());
+	Completed.connect (_completed_connection, MISSING_INVALIDATOR, boost::bind (&StripSilenceDialog::update, this), gui_context ());
 	_thread_should_finish = false;
 	pthread_create (&_thread, 0, StripSilenceDialog::_detection_thread_work, this);
 }
@@ -130,6 +127,9 @@ StripSilenceDialog::~StripSilenceDialog ()
 	_run_cond.signal ();
 	pthread_join (_thread, 0);
 
+	delete _minimum_length;
+	delete _fade_length;
+
 	delete _peaks_ready_connection;
 }
 
@@ -183,7 +183,7 @@ void
 StripSilenceDialog::update_silence_rects ()
 {
 	/* Lock so that we don't contend with the detection thread for access to the silence regions */
-	Glib::Mutex::Lock lm (_lock);
+	Glib::Threads::Mutex::Lock lm (_lock);
         double const y = _threshold.get_value();
 
         for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
@@ -273,13 +273,13 @@ 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 _fade_length.current_duration (views.front().view->region()->position());
+        return _fade_length->current_duration (views.front().view->region()->position());
 }
 
 void