X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=f17e37a72da4810dab3036818e497a6887b5f76d;hb=9041fc8d54f4f2e2a3871b05707569ea870f5520;hp=cb6b56912fe84ad4929f4123c5839f09ea4035ab;hpb=41a9060df9a5261ea7c9ca848ebdd5854d40fd86;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index cb6b56912f..f17e37a72d 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; }
@@ -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;