X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.h;h=8b2e43ac6470a31dc3b65274b9ff7f09545486ed;hb=237741d18722252abd4a6a20d3422315481ccffe;hp=886017ca8a855071ed4d88cd222bf8de9c98b7bb;hpb=ebf3762fa91d911af411f1b5c68e3c67f2c47170;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 886017ca8a..8b2e43ac64 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -18,17 +18,17 @@
 */
 
 #include <gtkmm/spinbutton.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/types.h"
 #include "ardour_dialog.h"
-#include "canvas.h"
 #include "progress_reporter.h"
 
 namespace ARDOUR {
         class Session;
 }
 
+class AudioClock;
 class RegionView;
 
 /// Dialog box to set options for the `strip silence' filter
@@ -45,7 +45,7 @@ public:
         void drop_rects ();
 
         void silences (ARDOUR::AudioIntervalMap&);
-        
+
 	ARDOUR::framecnt_t minimum_length () const;
         ARDOUR::framecnt_t fade_length () const;
 
@@ -63,8 +63,8 @@ private:
 	void restart_thread ();
 
 	Gtk::SpinButton _threshold;
-	AudioClock      _minimum_length;
-        AudioClock      _fade_length;
+	AudioClock*      _minimum_length;
+        AudioClock*      _fade_length;
 	Gtk::ProgressBar _progress_bar;
 
         struct ViewInterval {
@@ -83,8 +83,8 @@ private:
 	pthread_t _thread; ///< thread to compute silence in the background
 	static void * _detection_thread_work (void *);
 	void * detection_thread_work ();
-	Glib::Mutex _lock; ///< lock held while the thread is doing work
-	Glib::Cond _run_cond; ///< condition to wake the thread
+	Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work
+	Glib::Threads::Cond  _run_cond; ///< condition to wake the thread
 	bool _thread_should_finish; ///< true if the thread should terminate
 	PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed
 	PBD::ScopedConnection _completed_connection;