X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=8a56040afb321ad945a70c49b64a1710950b1dc7;hb=eed6d13b60ccba041ad710798832efa86ae39d12;hp=2b542b4a200625364469047903540206b291af67;hpb=66c9e166f8bb99bf4619edc79fe6720514cc2faa;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 2b542b4a20..8a56040afb 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,24 +26,27 @@
 
 #include "ardour/location.h"
 #include "enums.h"
-#include "simplerect.h"
-#include "canvas.h"
 
 namespace Gdk {
 	class Color;
 }
 
 namespace ARDOUR {
-	class Route;
 	class Crossfade;
-	class PeakData;
 	class Region;
+	class Route;
 	class Source;
 	class Track;
+	struct PeakData;
+}
+
+namespace ArdourCanvas {
+	class Rectangle;
+	class Container;
 }
 
 struct RecBoxInfo {
-	ArdourCanvas::SimpleRect*  rectangle;
+	ArdourCanvas::Rectangle*   rectangle;
 	framepos_t                 start;
 	ARDOUR::framecnt_t         length;
 };
@@ -70,23 +73,22 @@ public:
 	int set_position (gdouble x, gdouble y);
 	virtual int set_height (double);
 
-	virtual int set_samples_per_unit (gdouble spp);
-	gdouble     get_samples_per_unit () { return _samples_per_unit; }
-	virtual void horizontal_position_changed () {}
+	virtual int set_samples_per_pixel (double);
+	gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
  	void set_layer_display (LayerDisplay);
 	LayerDisplay layer_display () const { return _layer_display; }
 
-	ArdourCanvas::Group* background_group() { return _background_group; }
-	ArdourCanvas::Group* canvas_item() { return _canvas_group; }
+	ArdourCanvas::Container* canvas_item() { return _canvas_group; }
 
 	enum ColorTarget {
 		RegionColor,
 		StreamBaseColor
 	};
 
-	Gdk::Color get_region_color () const { return region_color; }
-	void       apply_color (Gdk::Color&, ColorTarget t);
+	uint32_t get_region_color () const { return region_color; }
+	void     apply_color (uint32_t, ColorTarget t);
+	void     apply_color (Gdk::Color const &, ColorTarget t);
 
 	uint32_t     num_selected_regionviews () const;
 
@@ -95,7 +97,7 @@ public:
 	void         foreach_selected_regionview (sigc::slot<void,RegionView*> slot);
 
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&);
+	void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&, bool within = false);
 	void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
 	virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
@@ -114,17 +116,22 @@ public:
 	}
 
 	void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
-	
+
+	virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+
 	sigc::signal<void, RegionView*> RegionViewAdded;
 	sigc::signal<void> RegionViewRemoved;
+	/** Emitted when the height of regions has changed */
+	sigc::signal<void> ContentsHeightChanged;
 
 protected:
-	StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
+       StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0);
 
 	void         transport_changed();
 	void         transport_looped();
 	void         rec_enable_changed();
 	void         sess_rec_enable_changed();
+	void         create_rec_box(framepos_t frame_pos, double width);
 	virtual void setup_rec_box () = 0;
 	virtual void update_rec_box ();
 
@@ -137,22 +144,18 @@ protected:
 	void         diskstream_changed ();
 	void         layer_regions ();
 
-	virtual void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
-	virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+	void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
 	virtual void color_handler () = 0;
 
 	RouteTimeAxisView&        _trackview;
-	bool                      owns_background_group;
-	bool                      owns_canvas_group;
-	ArdourCanvas::Group*      _background_group;
-	ArdourCanvas::Group*      _canvas_group;
-	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
+	ArdourCanvas::Container*      _canvas_group;
+	ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
 
 	typedef std::list<RegionView* > RegionViewList;
 	RegionViewList  region_views;
 
-	double _samples_per_unit;
+	double _samples_per_pixel;
 
 	sigc::connection       screen_update_connection;
 	std::vector<RecBoxInfo>     rec_rects;
@@ -160,8 +163,8 @@ protected:
 	bool                   rec_updating;
 	bool                   rec_active;
 
-	Gdk::Color region_color;      ///< Contained region color
-	uint32_t   stream_base_color; ///< Background color
+	uint32_t region_color;      ///< Contained region color
+	uint32_t stream_base_color; ///< Background color
 
 	PBD::ScopedConnectionList playlist_connections;
 	PBD::ScopedConnection playlist_switched_connection;
@@ -179,7 +182,7 @@ protected:
 	*/
 	framepos_t _new_rec_layer_time;
 	void setup_new_rec_layer_time (boost::shared_ptr<ARDOUR::Region>);
-	
+
 private:
 	void update_coverage_frames ();
 };