Use rectified log waveform in strip silence dialogue. Add threshold graphical indication. Update dialogue on open (fixes #3102). Various other small cleanups.

git-svn-id: svn://localhost/ardour2/branches/3.0@7030 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 3 deletions

diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 108bbb4b7b..1e8b140358 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -49,26 +49,32 @@ private:
 	void peaks_ready ();
 	void canvas_allocation (Gtk::Allocation &);
 	void update_silence_rects ();
-        void redraw_silence_rects ();
+        void resize_silence_rects ();
+	void update_threshold_line ();
+	void threshold_changed ();
 
 	Gtk::SpinButton _threshold;
 	AudioClock      _minimum_length;
         AudioClock      _fade_length;
         Gtk::Label      _segment_count_label;
+	Gtk::Label      _shortest_silence_label;
+	Gtk::Label      _shortest_audible_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;
+	    ArdourCanvas::SimpleLine* threshold_line;
             double samples_per_unit;
             SilenceResult silence;
           
-            Wave() : view (0), samples_per_unit (1) { }
+	    Wave (ArdourCanvas::Group *, boost::shared_ptr<ARDOUR::AudioRegion>);
+	    ~Wave ();
 	};
 
 	ArdourCanvas::Canvas* _canvas;
-	std::list<Wave> _waves;
+	std::list<Wave*> _waves;
 	int _wave_width;
 	int _wave_height;
         bool restart_queued;