X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=98329ee77bd74e03e72e2d3772d28651d9a71003;hb=4f3bddf7ef163c3106ba973123cbc657ebaf4b74;hp=426529c5286f32164b3fc8bfc8328e0aa1c4f72a;hpb=d7db3f757fde92126ef9886370ce604992b7e974;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 426529c528..98329ee77b 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -24,18 +24,19 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
-#include <ardour/region.h>
+#include "ardour/region.h"
+#include "ardour/beats_frames_converter.h"
 
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "waveview.h"
 #include "canvas.h"
 
 class TimeAxisView;
 class RegionEditor;
 class GhostRegion;
 class AutomationTimeAxisView;
+class AutomationRegionView;
 
 class RegionView : public TimeAxisViewItem
 {
@@ -44,21 +45,22 @@ class RegionView : public TimeAxisViewItem
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
 	            double               samples_per_unit,
-	            Gdk::Color&          basic_color);
+	            Gdk::Color const &   basic_color);
 
 	RegionView (const RegionView& other);
+	RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
 
 	~RegionView ();
 	
-	virtual void init (Gdk::Color& base_color, bool wait_for_data);
+	virtual void init (Gdk::Color const & base_color, bool wait_for_data);
     
 	boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
 	
 	bool is_valid() const    { return valid; }
 
-
 	void set_valid (bool yn) { valid = yn; }
 	
+	virtual void set_height (double);
 	virtual void set_samples_per_unit (double);
 	virtual bool set_duration (nframes_t, void*);
 	
@@ -70,13 +72,14 @@ class RegionView : public TimeAxisViewItem
 	bool set_position(nframes_t pos, void* src, double* delta = 0);
 	void fake_set_opaque (bool yn);
 	
-	virtual void show_region_editor () = 0;
+	virtual void show_region_editor () {}
 	virtual void hide_region_editor();
 	
 	virtual void region_changed (ARDOUR::Change);
 	
-	virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
-	void                 remove_ghost (GhostRegion*);
+	virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
+	void remove_ghost_in (TimeAxisView&);
+	void remove_ghost (GhostRegion*);
 	
 	uint32_t get_fill_color ();
 
@@ -84,9 +87,9 @@ class RegionView : public TimeAxisViewItem
 	virtual void exited () {}
 
 	void enable_display(bool yn) { _enable_display = yn; }
+	void update_coverage_frames (LayerDisplay);
 	
 	static sigc::signal<void,RegionView*> RegionViewGoingAway;
-	sigc::signal<void>                    GoingAway;
 	
   protected:
 	
@@ -96,15 +99,15 @@ class RegionView : public TimeAxisViewItem
     RegionView (ArdourCanvas::Group *, 
 		TimeAxisView&,
 		boost::shared_ptr<ARDOUR::Region>,
-		double      samples_per_unit,
-		Gdk::Color& basic_color,
+		double samples_per_unit,
+		Gdk::Color const & basic_color,
+		bool recording,
 		TimeAxisViewItem::Visibility);
     
     virtual void region_resized (ARDOUR::Change);
     virtual void region_muted ();
     void         region_locked ();
     void         region_opacity ();
-    void         region_layered ();
     virtual void region_renamed ();
     void         region_sync_changed ();
 
@@ -114,7 +117,6 @@ class RegionView : public TimeAxisViewItem
     void        lock_toggle ();
 
     virtual void set_colors ();
-    virtual void compute_colors (Gdk::Color&);
     virtual void set_frame_color ();
     virtual void reset_width_dependent_items (double pixel_width);
 
@@ -123,21 +125,31 @@ class RegionView : public TimeAxisViewItem
     boost::shared_ptr<ARDOUR::Region> _region;
     
     ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position 
+    ArdourCanvas::Line* sync_line; ///< polgyon for sync position 
 
     RegionEditor* editor;
 
-    vector<ControlPoint *> control_points;
+    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;
+    double  _height;
     bool    in_destructor;
     
     bool             wait_for_data;
     sigc::connection data_ready_connection;
     
-    vector<GhostRegion*> ghosts;
+    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;
+
+	ARDOUR::BeatsFramesConverter _time_converter;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */