X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=7fad731dc26cd82e6814af7875c162ade9212f9b;hb=c7863289664f0c847f6a5e1c0fa5b4c731c134d3;hp=389faf89210adda3c95ca2d4dece9a11585d52d5;hpb=5fef65538040fbac1b9edd1847a269aa925a49c9;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 389faf8921..7fad731dc2 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -85,6 +85,8 @@ class RegionView : public TimeAxisViewItem
 
 	virtual void region_changed (const PBD::PropertyChange&);
 
+	uint32_t get_fill_color () const;
+
 	virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
 	void remove_ghost_in (TimeAxisView&);
 	void remove_ghost (GhostRegion*);
@@ -100,12 +102,12 @@ class RegionView : public TimeAxisViewItem
 	/** Called when a front trim is about to begin */
 	virtual void trim_front_starting () {}
 
-	bool trim_front (framepos_t, bool);
+	bool trim_front (framepos_t, bool, const int32_t sub_num);
 
 	/** Called when a start trim has finished */
 	virtual void trim_front_ending () {}
 
-	bool trim_end (framepos_t, bool);
+	bool trim_end (framepos_t, bool, const int32_t sub_num);
         void move_contents (ARDOUR::frameoffset_t);
 	virtual void thaw_after_trim ();
 
@@ -113,8 +115,14 @@ class RegionView : public TimeAxisViewItem
         void drop_silent_frames ();
         void hide_silent_frames ();
 
-	ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t) const;
-	
+	struct PositionOrder {
+		bool operator()(const RegionView* a, const RegionView* b) {
+			return a->region()->position() < b->region()->position();
+		}
+	};
+
+	ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t, bool ensure_snap = false) const;
+
   protected:
 
 	/** Allows derived types to specify their visibility requirements
@@ -143,11 +151,9 @@ class RegionView : public TimeAxisViewItem
 	void        lock_toggle ();
 
 	virtual void set_colors ();
-	virtual void set_frame_color ();
+	virtual void set_sync_mark_color ();
 	virtual void reset_width_dependent_items (double pixel_width);
 
-	uint32_t fill_opacity () const;
-
 	virtual void color_handler () {}
 
 	boost::shared_ptr<ARDOUR::Region> _region;