audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way

git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 13 deletions

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 5863d7cde5..5f9dc6441d 100644
--- 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, "SilenceDurationClock", true, false, true, false))
+        , _fade_length (new AudioClock (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false))
 	, _peaks_ready_connection (0)
 	, _destroying (false)
 {
@@ -77,20 +78,20 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 	_threshold.set_value (-60);
 
 	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);
 
@@ -104,7 +105,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 	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 ();
@@ -130,6 +131,9 @@ StripSilenceDialog::~StripSilenceDialog ()
 	_run_cond.signal ();
 	pthread_join (_thread, 0);
 
+	delete _minimum_length;
+	delete _fade_length;
+
 	delete _peaks_ready_connection;
 }
 
@@ -273,13 +277,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