X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=8a56040afb321ad945a70c49b64a1710950b1dc7;hb=4c4061359cb33011e3acab016e8e604cd413a93d;hp=0fe56dd10c3efe40bd553c3178e4e80a5ea91b01;hpb=9a8ee11f6532c73320f76b10aabec68081c9ebf4;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 0fe56dd10c..8a56040afb 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -42,7 +42,7 @@ namespace ARDOUR {
 
 namespace ArdourCanvas {
 	class Rectangle;
-	class Group;
+	class Container;
 }
 
 struct RecBoxInfo {
@@ -73,26 +73,22 @@ public:
 	int set_position (gdouble x, gdouble y);
 	virtual int set_height (double);
 
-	virtual int set_frames_per_pixel (double);
-	gdouble     get_frames_per_pixel () const { return _frames_per_pixel; }
-	virtual void horizontal_position_changed () {}
-
-        virtual void enter_internal_edit_mode ();
-        virtual void leave_internal_edit_mode ();
+	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;
 
@@ -101,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>) {}
@@ -122,19 +118,20 @@ 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 ();
 
@@ -152,16 +149,13 @@ protected:
 	virtual void color_handler () = 0;
 
 	RouteTimeAxisView&        _trackview;
-	bool                      owns_background_group;
-	bool                      owns_canvas_group;
-	ArdourCanvas::Group*      _background_group;
-	ArdourCanvas::Group*      _canvas_group;
-	ArdourCanvas::Rectangle*  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 _frames_per_pixel;
+	double _samples_per_pixel;
 
 	sigc::connection       screen_update_connection;
 	std::vector<RecBoxInfo>     rec_rects;
@@ -169,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;