X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fregion_view.h;h=0837c075f0e3615cd8d593c5b639d63fe3ae23df;hb=dcf4d7b38a5d9e0db31924912180edd6c922ca34;hp=a5d5fddbd08acb5d2be6a0b4b82e0264e52a9a04;hpb=75b933eadbe8f90a73a29bb207ff26eebcd4121a;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index a5d5fddbd0..0837c075f0 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -49,11 +49,11 @@ namespace ArdourCanvas {
 class RegionView : public TimeAxisViewItem
 {
   public:
-	RegionView (ArdourCanvas::Group* parent,
+	RegionView (ArdourCanvas::Container* parent,
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
 	            double               samples_per_pixel,
-	            Gdk::Color const &   basic_color,
+	            uint32_t             base_color,
 		    bool 		 automation = false);
 
 	RegionView (const RegionView& other);
@@ -61,7 +61,7 @@ class RegionView : public TimeAxisViewItem
 
 	~RegionView ();
 
-	virtual void init (Gdk::Color const & base_color, bool wait_for_data);
+	virtual void init (bool wait_for_data);
 
 	boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
 
@@ -79,7 +79,6 @@ class RegionView : public TimeAxisViewItem
 	void lower_to_bottom ();
 
 	bool set_position(framepos_t pos, void* src, double* delta = 0);
-	void fake_set_opaque (bool yn);
 
 	virtual void show_region_editor ();
 	void hide_region_editor ();
@@ -90,8 +89,6 @@ class RegionView : public TimeAxisViewItem
 	void remove_ghost_in (TimeAxisView&);
 	void remove_ghost (GhostRegion*);
 
-	uint32_t get_fill_color ();
-
 	virtual void entered (bool) {}
 	virtual void exited () {}
 
@@ -131,11 +128,11 @@ class RegionView : public TimeAxisViewItem
 	/** Allows derived types to specify their visibility requirements
 	 * to the TimeAxisViewItem parent class
 	 */
-	RegionView (ArdourCanvas::Group *,
+	RegionView (ArdourCanvas::Container *,
 		    TimeAxisView&,
 		    boost::shared_ptr<ARDOUR::Region>,
 		    double samples_per_pixel,
-		    Gdk::Color const & basic_color,
+		    uint32_t basic_color,
 		    bool recording,
 		    TimeAxisViewItem::Visibility);
 
@@ -157,6 +154,8 @@ class RegionView : public TimeAxisViewItem
 	virtual void set_frame_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;