X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=21819586721ee6b6d147cef0e280f3385016df4c;hb=8e3b1c17c1907417edf665e833529690644941a9;hp=a22ba9443959d12be288aeb8d7b9f345cd0d6533;hpb=9aacefc17010a889222425f97b99050171165038;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index a22ba94439..2181958672 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -59,7 +59,7 @@ namespace Gtk {
 
 namespace ArdourCanvas {
 	class Canvas;
-	class Group;
+	class Container;
 	class Item;
 }
 
@@ -104,8 +104,8 @@ class TimeAxisView : public virtual AxisView
         virtual void enter_internal_edit_mode () {}
         virtual void leave_internal_edit_mode () {}
 
-	ArdourCanvas::Group* canvas_display () { return _canvas_display; }
-	ArdourCanvas::Group* ghost_group () { return _ghost_group; }
+	ArdourCanvas::Container* canvas_display () { return _canvas_display; }
+	ArdourCanvas::Container* ghost_group () { return _ghost_group; }
 
 	/** @return effective height (taking children into account) in canvas units, or
 	    0 if this TimeAxisView has not yet been shown */
@@ -144,7 +144,8 @@ class TimeAxisView : public virtual AxisView
 
 	virtual void reset_visual_state ();
 
-	std::pair<TimeAxisView*, double> covers_y_position (double);
+	std::pair<TimeAxisView*, double> covers_y_position (double) const;
+        bool covered_by_y_range (double y0, double y1) const;
 
 	virtual void step_height (bool);
 
@@ -166,6 +167,8 @@ class TimeAxisView : public virtual AxisView
 	virtual void set_selected_regionviews (RegionSelection&) {}
 	virtual void set_selected_points (PointSelection&) {}
 
+	virtual void fade_range (TimeSelection&) {}
+
 	virtual boost::shared_ptr<ARDOUR::Region> find_next_region (framepos_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
 		return boost::shared_ptr<ARDOUR::Region> ();
 	}
@@ -200,10 +203,14 @@ class TimeAxisView : public virtual AxisView
 	/* The Standard LHS Controls */
 	Gtk::HBox              controls_hbox;
 	Gtk::Table             controls_table;
+	Gtk::Table             name_table;
 	Gtk::EventBox          controls_ebox;
 	Gtk::VBox              controls_vbox;
+	Gtk::VBox              name_vbox;
 	Gtk::VBox              time_axis_vbox;
+	Gtk::Frame              time_axis_frame;
 	Gtk::HBox              name_hbox;
+	Gtk::HBox              top_hbox;
 	Gtk::Label             name_label;
         bool                  _name_editing;
         uint32_t               height;  /* in canvas units */
@@ -211,15 +218,15 @@ class TimeAxisView : public virtual AxisView
 	std::string            controls_base_selected_name;
 	Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
 	TimeAxisView*          parent;
-	ArdourCanvas::Group*   selection_group;
-	ArdourCanvas::Group*  _ghost_group;
+	ArdourCanvas::Container*   selection_group;
+	ArdourCanvas::Container*  _ghost_group;
 	std::list<GhostRegion*> ghosts;
 	std::list<SelectionRect*> free_selection_rects;
 	std::list<SelectionRect*> used_selection_rects;
 	bool                  _hidden;
 	bool                   in_destructor;
 	Gtk::Menu*            _size_menu;
-	ArdourCanvas::Group*  _canvas_display;
+	ArdourCanvas::Container*  _canvas_display;
 	double                _y_position;
 	PublicEditor&         _editor;