X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=5ae1f96fb07d3bdd36e0d9c439566449019d4dc0;hb=49a9fa20a56c6f5607e7bcf209985a67972c3f31;hp=5f114bfcbfbb0be83b1e3894a44680ef32135a4f;hpb=36d88c8e494c1997c05d122fa03c00d0e8b6e401;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 5f114bfcbf..5ae1f96fb0 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -29,9 +29,7 @@
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "waveview.h"
 #include "canvas.h"
-#include "color.h"
 
 class TimeAxisView;
 class RegionEditor;
@@ -48,6 +46,7 @@ class RegionView : public TimeAxisViewItem
 	            Gdk::Color&          basic_color);
 
 	RegionView (const RegionView& other);
+	RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
 
 	~RegionView ();
 	
@@ -60,7 +59,7 @@ class RegionView : public TimeAxisViewItem
 
 	void set_valid (bool yn) { valid = yn; }
 	
-	virtual void set_height (double) = 0;
+	virtual void set_height (double);
 	virtual void set_samples_per_unit (double);
 	virtual bool set_duration (nframes_t, void*);
 	
@@ -73,7 +72,7 @@ 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 hide_region_editor();
 	
@@ -100,13 +99,14 @@ class RegionView : public TimeAxisViewItem
 		boost::shared_ptr<ARDOUR::Region>,
 		double      samples_per_unit,
 		Gdk::Color& basic_color,
+		bool recording,
 		TimeAxisViewItem::Visibility);
 
     virtual void region_resized (ARDOUR::Change);
     void         region_moved (void *);
     virtual void region_muted ();
     void         region_locked ();
-    void         region_opacity ();
+	void         region_opacity ();
     void         region_layered ();
     void         region_renamed ();
     void         region_sync_changed ();
@@ -119,11 +119,12 @@ class RegionView : public TimeAxisViewItem
     virtual void set_frame_color ();
     virtual void reset_width_dependent_items (double pixel_width);
     
-    virtual void color_handler (ColorID, uint32_t) {}
+    virtual void color_handler () {}
 	
     boost::shared_ptr<ARDOUR::Region> _region;
     
     ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position 
+    ArdourCanvas::Line* sync_line; ///< polgyon for sync position 
 
     RegionEditor* editor;
 
@@ -132,7 +133,6 @@ class RegionView : public TimeAxisViewItem
 
     bool     valid; ///< see StreamView::redisplay_diskstream() 
     double  _pixel_width;
-    double  _height;
     bool    in_destructor;
     
     bool             wait_for_data;