X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=566304fa92cf0ea8d9e48bcf0c5821308ed793e9;hb=74126c48c0726e5491a160d2b0f04e406fc80231;hp=c291d60cf6602da54eef8066c8d42f0da85a714a;hpb=f17661208686f7237efc902c61028462af75a240;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index c291d60cf6..566304fa92 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -21,16 +21,15 @@
 
 #include <vector>
 
-#include <libgnomecanvasmm.h>
-#include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
 #include "ardour/region.h"
 #include "ardour/beats_frames_converter.h"
 
+#include "canvas/fwd.h"
+
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "canvas.h"
 
 class TimeAxisView;
 class RegionEditor;
@@ -38,9 +37,10 @@ class GhostRegion;
 class AutomationTimeAxisView;
 class AutomationRegionView;
 
-namespace Gnome { namespace Canvas {
-	class NoEventText;
-} }
+namespace ArdourCanvas {
+	class Polygon;
+	class Text;
+}
 
 class RegionView : public TimeAxisViewItem
 {
@@ -48,7 +48,7 @@ class RegionView : public TimeAxisViewItem
 	RegionView (ArdourCanvas::Group* parent,
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
-	            double               samples_per_unit,
+	            double               samples_per_pixel,
 	            Gdk::Color const &   basic_color,
 		    bool 		 automation = false);
 
@@ -66,7 +66,7 @@ class RegionView : public TimeAxisViewItem
 	void set_valid (bool yn) { valid = yn; }
 
 	virtual void set_height (double);
-	virtual void set_samples_per_unit (double);
+	virtual void set_samples_per_pixel (double);
 	virtual bool set_duration (framecnt_t, void*);
 
 	void move (double xdelta, double ydelta);
@@ -96,27 +96,32 @@ class RegionView : public TimeAxisViewItem
 
 	static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
 
-	ARDOUR::BeatsFramesConverter const & time_converter () {
-		return _time_converter;
+	ARDOUR::BeatsFramesConverter const & region_relative_time_converter () const {
+		return _region_relative_time_converter;
+	}
+
+	ARDOUR::BeatsFramesConverter const & source_relative_time_converter () const {
+		return _source_relative_time_converter;
 	}
 
 	/** Called when a front trim is about to begin */
 	virtual void trim_front_starting () {}
 
-	void trim_front (framepos_t, bool);
+	bool trim_front (framepos_t, bool);
 
 	/** Called when a start trim has finished */
 	virtual void trim_front_ending () {}
-	
-	void trim_end (framepos_t, bool);
+
+	bool trim_end (framepos_t, bool);
 	void trim_contents (framepos_t, bool, bool);
 	virtual void thaw_after_trim ();
 
-        void set_silent_frames (const ARDOUR::AudioIntervalResult&);
+        void set_silent_frames (const ARDOUR::AudioIntervalResult&, double threshold);
         void drop_silent_frames ();
         void hide_silent_frames ();
-        void show_silent_frames ();
 
+	ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t) const;
+	
   protected:
 
 	/** Allows derived types to specify their visibility requirements
@@ -125,36 +130,36 @@ class RegionView : public TimeAxisViewItem
 	RegionView (ArdourCanvas::Group *,
 		    TimeAxisView&,
 		    boost::shared_ptr<ARDOUR::Region>,
-		    double samples_per_unit,
+		    double samples_per_pixel,
 		    Gdk::Color const & basic_color,
 		    bool recording,
 		    TimeAxisViewItem::Visibility);
-	
+
 	virtual void region_resized (const PBD::PropertyChange&);
 	virtual void region_muted ();
 	void         region_locked ();
 	void         region_opacity ();
 	virtual void region_renamed ();
 	void         region_sync_changed ();
-	
+
 	std::string make_name () const;
-	
+
 	static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
 	void        lock_toggle ();
-	
+
 	virtual void set_colors ();
 	virtual void set_frame_color ();
 	virtual void reset_width_dependent_items (double pixel_width);
-	
+
 	virtual void color_handler () {}
-	
+
 	boost::shared_ptr<ARDOUR::Region> _region;
-	
+
 	ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
 	ArdourCanvas::Line* sync_line; ///< polgyon for sync position
-	
+
 	RegionEditor* editor;
-	
+
 	std::vector<ControlPoint *> control_points;
 	double current_visible_sync_position;
 
@@ -162,27 +167,29 @@ class RegionView : public TimeAxisViewItem
 	bool    _enable_display; ///< see StreamView::redisplay_diskstream()
 	double  _pixel_width;
 	bool    in_destructor;
-	
+
 	bool wait_for_data;
-	
+
 	std::vector<GhostRegion*> ghosts;
-	
+
 	/** a list of rectangles which are used in stacked display mode to colour
 	    different bits of regions according to whether or not they are the one
 	    that will be played at any given time.
 	*/
-	std::list<ArdourCanvas::SimpleRect*> _coverage_frames;
+	std::list<ArdourCanvas::Rectangle*> _coverage_frames;
 
-	/** a list of rectangles which are used in stacked display mode to colour
-	    different bits of regions according to whether or not they are the one
-	    that will be played at any given time.
+	/** a list of rectangles used to show silent segments
 	*/
-	std::list<ArdourCanvas::SimpleRect*> _silent_frames;
+	std::list<ArdourCanvas::Rectangle*> _silent_frames;
+	/** a list of rectangles used to show the current silence threshold
+	*/
+	std::list<ArdourCanvas::Rectangle*> _silent_threshold_frames;
         /** a text item to display strip silence statistics
          */
-        ArdourCanvas::NoEventText* _silence_text;
-        
-	ARDOUR::BeatsFramesConverter _time_converter;
+        ArdourCanvas::Text* _silence_text;
+
+	ARDOUR::BeatsFramesConverter _region_relative_time_converter;
+	ARDOUR::BeatsFramesConverter _source_relative_time_converter;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */