X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=a96862f08a304ad543942b2933cdbf961b8f72a1;hb=267cfbe731debe3f3be88375bce34644ac7c6323;hp=5421d7d6134d376630aeec47c7b7d95316461f00;hpb=27dd925f42911c527d8a4ffba3225dbac3c62bac;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 5421d7d613..a96862f08a 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -38,6 +38,10 @@ class GhostRegion;
 class AutomationTimeAxisView;
 class AutomationRegionView;
 
+namespace Gnome { namespace Canvas {
+	class NoEventText;
+} }
+
 class RegionView : public TimeAxisViewItem
 {
   public:
@@ -45,7 +49,8 @@ class RegionView : public TimeAxisViewItem
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
 	            double               samples_per_unit,
-	            Gdk::Color const &   basic_color);
+	            Gdk::Color const &   basic_color,
+		    bool 		 automation = false);
 
 	RegionView (const RegionView& other);
 	RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
@@ -62,14 +67,14 @@ class RegionView : public TimeAxisViewItem
 
 	virtual void set_height (double);
 	virtual void set_samples_per_unit (double);
-	virtual bool set_duration (nframes64_t, void*);
+	virtual bool set_duration (framecnt_t, void*);
 
 	void move (double xdelta, double ydelta);
 
 	void raise_to_top ();
 	void lower_to_bottom ();
 
-	bool set_position(nframes64_t pos, void* src, double* delta = 0);
+	bool set_position(framepos_t pos, void* src, double* delta = 0);
 	void fake_set_opaque (bool yn);
 
 	virtual void show_region_editor ();
@@ -91,62 +96,92 @@ class RegionView : public TimeAxisViewItem
 
 	static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
 
-  protected:
-
-	/** Allows derived types to specify their visibility requirements
-     * to the TimeAxisViewItem parent class
-     */
-    RegionView (ArdourCanvas::Group *,
-		TimeAxisView&,
-		boost::shared_ptr<ARDOUR::Region>,
-		double samples_per_unit,
-		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 ();
-
-    Glib::ustring 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);
+	ARDOUR::BeatsFramesConverter const & time_converter () {
+		return _time_converter;
+	}
 
-    virtual void color_handler () {}
+	/** Called when a front trim is about to begin */
+	virtual void trim_front_starting () {}
 
-    boost::shared_ptr<ARDOUR::Region> _region;
+	void trim_front (framepos_t, bool);
 
-    ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
-    ArdourCanvas::Line* sync_line; ///< polgyon for sync position
+	/** Called when a start trim has finished */
+	virtual void trim_front_ending () {}
+	
+	void trim_end (framepos_t, bool);
+	void trim_contents (framepos_t, bool, bool);
+	virtual void thaw_after_trim ();
 
-    RegionEditor* editor;
+        void set_silent_frames (const ARDOUR::AudioIntervalResult&, double threshold);
+        void drop_silent_frames ();
+        void hide_silent_frames ();
 
-    std::vector<ControlPoint *> control_points;
-    double current_visible_sync_position;
-
-    bool    valid; ///< see StreamView::redisplay_diskstream()
-    bool    _enable_display; ///< see StreamView::redisplay_diskstream()
-    double  _pixel_width;
-    bool    in_destructor;
-
-    bool wait_for_data;
-
-    std::vector<GhostRegion*> ghosts;
+  protected:
 
+	/** Allows derived types to specify their visibility requirements
+	 * to the TimeAxisViewItem parent class
+	 */
+	RegionView (ArdourCanvas::Group *,
+		    TimeAxisView&,
+		    boost::shared_ptr<ARDOUR::Region>,
+		    double samples_per_unit,
+		    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;
+
+	bool    valid; ///< see StreamView::redisplay_diskstream()
+	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;
 
+	/** a list of rectangles used to show silent segments 
+	*/
+	std::list<ArdourCanvas::SimpleRect*> _silent_frames;
+	/** a list of rectangles used to show the current silence threshold
+	*/
+	std::list<ArdourCanvas::SimpleRect*> _silent_threshold_frames;
+        /** a text item to display strip silence statistics
+         */
+        ArdourCanvas::NoEventText* _silence_text;
+        
 	ARDOUR::BeatsFramesConverter _time_converter;
 };