Windows XP compat

[ardour.git] / gtk2_ardour / strip_silence_dialog.h

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 62e58e7db5174699c70cf125429aedf89d061856..8b2e43ac6470a31dc3b65274b9ff7f09545486ed 100644 (file)
--- 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
@@ -42,6 +42,10 @@ public:
                return _threshold.get_value ();
        }
 
+        void drop_rects ();
+
+        void silences (ARDOUR::AudioIntervalMap&);
+
        ARDOUR::framecnt_t minimum_length () const;
         ARDOUR::framecnt_t fade_length () const;
 
@@ -59,11 +63,8 @@ private:
        void restart_thread ();
 
        Gtk::SpinButton _threshold;
-       AudioClock      _minimum_length;
-        AudioClock      _fade_length;
-        Gtk::Label      _segment_count_label;
-       Gtk::Label      _shortest_silence_label;
-       Gtk::Label      _shortest_audible_label;
+       AudioClock*      _minimum_length;
+        AudioClock*      _fade_length;
        Gtk::ProgressBar _progress_bar;
 
         struct ViewInterval {
@@ -75,11 +76,6 @@ private:
 
         std::list<ViewInterval> views;
 
-        ARDOUR::framecnt_t max_audible;
-        ARDOUR::framecnt_t min_audible;
-        ARDOUR::framecnt_t max_silence;
-        ARDOUR::framecnt_t min_silence;
-
        PBD::ScopedConnection* _peaks_ready_connection;
 
        bool _destroying;
@@ -87,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;