remove cruft

[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 78e1d5cfbd52e3e928a2f882a402b10a05f46970..01d6487f74b33dd2ad85752de2199aa6bdaac428 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -22,21 +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"
@@ -49,9 +43,8 @@ using namespace ArdourCanvas;
 StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        : ArdourDialog (_("Strip Silence"))
        , ProgressReporter ()
-        , _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)
+        , _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)
 {
         set_session (s);
@@ -113,7 +106,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        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, invalidator(*this), boost::bind (&StripSilenceDialog::update, this), gui_context ());
        _thread_should_finish = false;
        pthread_create (&_thread, 0, StripSilenceDialog::_detection_thread_work, this);
 }
@@ -124,7 +117,6 @@ StripSilenceDialog::~StripSilenceDialog ()
        _destroying = true;
 
        /* Terminate our thread */
-
        _lock.lock ();
        _interthread_info.cancel = true;
        _thread_should_finish = true;
@@ -135,8 +127,6 @@ StripSilenceDialog::~StripSilenceDialog ()
 
        delete _minimum_length;
        delete _fade_length;
-
-       delete _peaks_ready_connection;
 }
 
 void
@@ -189,7 +179,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) {