X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=5421d7d6134d376630aeec47c7b7d95316461f00;hb=d936bdb3a8e55d26a238376d4b99f56ebeb582b1;hp=0f4d57ad04d38d72d6430d370780709d1406d3b9;hpb=6cf8026ac37cddb9cf84dbdecba9b7f576641fd8;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 0f4d57ad04..5421d7d613 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001-2006 Paul Davis 
+    Copyright (C) 2001-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,90 +24,90 @@
 #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"
-#include "color.h"
 
 class TimeAxisView;
 class RegionEditor;
 class GhostRegion;
 class AutomationTimeAxisView;
+class AutomationRegionView;
 
 class RegionView : public TimeAxisViewItem
 {
   public:
-	RegionView (ArdourCanvas::Group* parent, 
+	RegionView (ArdourCanvas::Group* parent,
 	            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; }
 
+	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*);
-	
+	virtual bool set_duration (nframes64_t, void*);
+
 	void move (double xdelta, double ydelta);
-	
-	void raise ();
+
 	void raise_to_top ();
-	void lower ();
 	void lower_to_bottom ();
 
-	bool set_position(nframes_t pos, void* src, double* delta = 0);
+	bool set_position(nframes64_t pos, void* src, double* delta = 0);
 	void fake_set_opaque (bool yn);
-	
-	virtual void show_region_editor () = 0;
-	virtual void hide_region_editor();
-	
-	virtual void region_changed (ARDOUR::Change);
-	
-	virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
-	void                 remove_ghost (GhostRegion*);
-	
+
+	virtual void show_region_editor ();
+	void hide_region_editor ();
+
+	virtual void region_changed (const PBD::PropertyChange&);
+
+	virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
+	void remove_ghost_in (TimeAxisView&);
+	void remove_ghost (GhostRegion*);
+
 	uint32_t get_fill_color ();
 
-	virtual void entered () {}
+	virtual void entered (bool) {}
 	virtual void exited () {}
-	
-	static sigc::signal<void,RegionView*> RegionViewGoingAway;
-	sigc::signal<void>                    GoingAway;
-	
+
+	virtual void enable_display(bool yn) { _enable_display = yn; }
+	virtual void update_coverage_frames (LayerDisplay);
+
+	static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
+
   protected:
-	
+
 	/** Allows derived types to specify their visibility requirements
      * to the TimeAxisViewItem parent class
      */
-    RegionView (ArdourCanvas::Group *, 
+    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);
-    void         region_moved (void *);
+
+    virtual void region_resized (const PBD::PropertyChange&);
     virtual void region_muted ();
     void         region_locked ();
     void         region_opacity ();
-    void         region_layered ();
     virtual void region_renamed ();
     void         region_sync_changed ();
 
@@ -117,30 +117,37 @@ 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);
 
-    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::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    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;
+
+    bool wait_for_data;
+
+    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__ */