X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.h;h=5ba88812d7daf90d01ad6ea769a46496766914de;hb=01e0f512232fe73c18339f368c90f581a5bebdb2;hp=625e9b65fd592d7af6bca459296faf6b49d0b7c7;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 625e9b65fd..5ba88812d7 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -18,7 +18,7 @@
 */
 
 #include <gtkmm/spinbutton.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/types.h"
 #include "ardour_dialog.h"
@@ -26,27 +26,31 @@
 #include "progress_reporter.h"
 
 namespace ARDOUR {
-	class AudioRegion;
         class Session;
 }
 
+class AudioClock;
+class RegionView;
+
 /// Dialog box to set options for the `strip silence' filter
 class StripSilenceDialog : public ArdourDialog, public ProgressReporter
 {
 public:
-        StripSilenceDialog (ARDOUR::Session*, std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const &);
+        StripSilenceDialog (ARDOUR::Session*, std::list<RegionView*> const &);
 	~StripSilenceDialog ();
 
 	double threshold () const {
 		return _threshold.get_value ();
 	}
 
+        void drop_rects ();
+
+        void silences (ARDOUR::AudioIntervalMap&);
+
 	ARDOUR::framecnt_t minimum_length () const;
         ARDOUR::framecnt_t fade_length () const;
 
 private:
-        typedef std::list<std::pair<ARDOUR::frameoffset_t,ARDOUR::framecnt_t> > SilenceResult;
-	
 	void create_waves ();
 	void peaks_ready ();
 	void canvas_allocation (Gtk::Allocation &);
@@ -54,40 +58,24 @@ private:
         void resize_silence_rects ();
 	void update ();
 	void update_threshold_line ();
-	void update_stats (SilenceResult const &);
+	void update_stats (ARDOUR::AudioIntervalResult const &);
 	void threshold_changed ();
 	void update_progress_gui (float);
 	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 Wave {
-		boost::shared_ptr<ARDOUR::AudioRegion> region;
-		ArdourCanvas::WaveView* view;
-		std::list<ArdourCanvas::SimpleRect*> silence_rects;
-		ArdourCanvas::SimpleLine* threshold_line;
-		double samples_per_unit;
-		SilenceResult silence;
-		
-		Wave (ArdourCanvas::Group *, boost::shared_ptr<ARDOUR::AudioRegion>);
-		~Wave ();
-	};
-
-	ArdourCanvas::Canvas* _canvas;
-	std::list<Wave*> _waves;
-	int _wave_width;
-	int _wave_height;
-
-        ARDOUR::framecnt_t max_audible;
-        ARDOUR::framecnt_t min_audible;
-        ARDOUR::framecnt_t max_silence;
-        ARDOUR::framecnt_t min_silence;
+        struct ViewInterval {
+            RegionView* view;
+            ARDOUR::AudioIntervalResult intervals;
+
+            ViewInterval (RegionView* rv) : view (rv) {}
+        };
+
+        std::list<ViewInterval> views;
 
 	PBD::ScopedConnection* _peaks_ready_connection;
 
@@ -96,8 +84,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;