X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.h;h=8b2e43ac6470a31dc3b65274b9ff7f09545486ed;hb=0ef661305daf1e2a451f6ba430c9e882ad6bcb4f;hp=108bbb4b7b12fddbadeacb97148d0adefa95c43d;hpb=9213e9c9094468ce21be378ea017b0da1405bf03;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 108bbb4b7b..8b2e43ac64 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -18,82 +18,75 @@
 */
 
 #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 AudioRegion;
         class Session;
 }
 
+class AudioClock;
+class RegionView;
+
 /// Dialog box to set options for the `strip silence' filter
-class StripSilenceDialog : public ArdourDialog
+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 ();
 	}
 
-        nframes_t minimum_length () const;
-        nframes_t fade_length () const;
-        static void stop_thread ();
+        void drop_rects ();
+
+        void silences (ARDOUR::AudioIntervalMap&);
+
+	ARDOUR::framecnt_t minimum_length () const;
+        ARDOUR::framecnt_t fade_length () const;
 
 private:
 	void create_waves ();
 	void peaks_ready ();
 	void canvas_allocation (Gtk::Allocation &);
 	void update_silence_rects ();
-        void redraw_silence_rects ();
+        void resize_silence_rects ();
+	void update ();
+	void update_threshold_line ();
+	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;
-        typedef std::list<std::pair<ARDOUR::frameoffset_t,ARDOUR::framecnt_t> > SilenceResult;
-
-	struct Wave {
-            boost::shared_ptr<ARDOUR::AudioRegion> region;
-            ArdourCanvas::WaveView* view;
-            std::list<ArdourCanvas::SimpleRect*> silence_rects;
-            double samples_per_unit;
-            SilenceResult silence;
-          
-            Wave() : view (0), samples_per_unit (1) { }
-	};
-
-	ArdourCanvas::Canvas* _canvas;
-	std::list<Wave> _waves;
-	int _wave_width;
-	int _wave_height;
-        bool restart_queued;
-
-        static ARDOUR::InterThreadInfo itt;
-        static bool thread_should_exit;
-        static Glib::Cond *thread_run;
-        static Glib::Cond *thread_waiting;
-        static Glib::StaticMutex run_lock;
-        static StripSilenceDialog* current;
-
-        ARDOUR::framecnt_t max_audible;
-        ARDOUR::framecnt_t min_audible;
-        ARDOUR::framecnt_t max_silence;
-        ARDOUR::framecnt_t min_silence;
+	AudioClock*      _minimum_length;
+        AudioClock*      _fade_length;
+	Gtk::ProgressBar _progress_bar;
 
-	PBD::ScopedConnection* _peaks_ready_connection;
-    
-        static bool  _detection_done (void*);
-        static void* _detection_thread_work (void*);
+        struct ViewInterval {
+            RegionView* view;
+            ARDOUR::AudioIntervalResult intervals;
 
-        bool  detection_done ();
-        void* detection_thread_work ();
-        bool  start_silence_detection ();
-        void  maybe_start_silence_detection ();
+            ViewInterval (RegionView* rv) : view (rv) {}
+        };
+
+        std::list<ViewInterval> views;
+
+	PBD::ScopedConnection* _peaks_ready_connection;
 
-        void update_stats (const SilenceResult&);
+	bool _destroying;
+
+	pthread_t _thread; ///< thread to compute silence in the background
+	static void * _detection_thread_work (void *);
+	void * detection_thread_work ();
+	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;
+	ARDOUR::InterThreadInfo _interthread_info;
 };