X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=7fad731dc26cd82e6814af7875c162ade9212f9b;hb=822810b88fd13d1764b5f686baa8edb3e27e95fc;hp=0837c075f0e3615cd8d593c5b639d63fe3ae23df;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 0837c075f0..7fad731dc2 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -85,11 +85,13 @@ 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*);
 
-	virtual void entered (bool) {}
+	virtual void entered () {}
 	virtual void exited () {}
 
 	virtual void enable_display(bool yn) { _enable_display = yn; }
@@ -97,23 +99,15 @@ class RegionView : public TimeAxisViewItem
 
 	static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
 
-	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 () {}
 
-	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 ();
 
@@ -121,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
@@ -151,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;
@@ -192,9 +190,6 @@ class RegionView : public TimeAxisViewItem
         /** a text item to display strip silence statistics
          */
         ArdourCanvas::Text* _silence_text;
-
-	ARDOUR::BeatsFramesConverter _region_relative_time_converter;
-	ARDOUR::BeatsFramesConverter _source_relative_time_converter;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */