X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=8a56040afb321ad945a70c49b64a1710950b1dc7;hb=bd80b2f144c012669b56c83821e137be655acfe4;hp=7c7bbad9246b1e03449370a465c9221a05595ab8;hpb=0796ccfb652dd31ea1d94526e0e6d92863a972b0;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 7c7bbad924..8a56040afb 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -42,7 +42,7 @@ namespace ARDOUR {
 
 namespace ArdourCanvas {
 	class Rectangle;
-	class Layout;
+	class Container;
 }
 
 struct RecBoxInfo {
@@ -76,13 +76,10 @@ public:
 	virtual int set_samples_per_pixel (double);
 	gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
-        virtual void enter_internal_edit_mode ();
-        virtual void leave_internal_edit_mode ();
-
  	void set_layer_display (LayerDisplay);
 	LayerDisplay layer_display () const { return _layer_display; }
 
-	ArdourCanvas::Layout* canvas_item() { return _canvas_group; }
+	ArdourCanvas::Container* canvas_item() { return _canvas_group; }
 
 	enum ColorTarget {
 		RegionColor,
@@ -100,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>) {}
@@ -121,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::Layout* 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 ();
 
@@ -151,7 +149,7 @@ protected:
 	virtual void color_handler () = 0;
 
 	RouteTimeAxisView&        _trackview;
-	ArdourCanvas::Layout*      _canvas_group;
+	ArdourCanvas::Container*      _canvas_group;
 	ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
 
 	typedef std::list<RegionView* > RegionViewList;