X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.h;h=8179d2cbe2ee51ab5ba43ddc99574fc343a3938e;hb=63a4cc9cf6e02153a6c647867abfec6b013e0708;hp=927764e57c439796f67c2e3244943d7036c072a9;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 927764e57c..8179d2cbe2 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -18,53 +18,84 @@
 */
 
 #include <gtkmm/spinbutton.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 (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 {
-		return _minimum_length.get_value_as_int ();
-	}
+	void drop_rects ();
+
+	void silences (ARDOUR::AudioIntervalMap&);
+
+	ARDOUR::samplecnt_t minimum_length () const;
+	ARDOUR::samplecnt_t fade_length () const;
 
-	nframes_t fade_length () const {
-		return _fade_length.get_value_as_int ();
+	void on_response (int response_id) {
+		Gtk::Dialog::on_response (response_id);
 	}
 
 private:
 	void create_waves ();
-	void peaks_ready ();
 	void canvas_allocation (Gtk::Allocation &);
 	void update_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;
-	Gtk::SpinButton _minimum_length;
-	Gtk::SpinButton _fade_length;
-
-	struct Wave {
-		boost::shared_ptr<ARDOUR::AudioRegion> region;
-		ArdourCanvas::WaveView* view;
-		std::list<ArdourCanvas::SimpleRect*> silence_rects;
-		double samples_per_unit;
+	AudioClock*      _minimum_length;
+	AudioClock*      _fade_length;
+	Gtk::ProgressBar _progress_bar;
+
+	Gtk::Button* cancel_button;
+	Gtk::Button* apply_button;
+
+	struct ViewInterval {
+		RegionView* view;
+		ARDOUR::AudioIntervalResult intervals;
+
+		ViewInterval (RegionView* rv) : view (rv) {}
 	};
 
-	ArdourCanvas::Canvas* _canvas;
-	std::list<Wave> _waves;
-	int _wave_width;
-	int _wave_height;
+	std::list<ViewInterval> views;
+
+	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;
 
-	PBD::ScopedConnection _peaks_ready_connection;
+	sigc::connection progress_idle_connection;
+	bool idle_update_progress(); ///< GUI-thread progress updates of background silence computation
+	int analysis_progress_cur;
+	int analysis_progress_max;
 };