X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=9630b3f19c0b0ccdd66943720933a36b2598b3fb;hb=b461bc1dc1970a9e147c43a721d3155f6215f8c7;hp=031b4e26f27198df383c25faa1e8b3e16d153aa7;hpb=c06c6c153db6b33b93515100d839f376dc805d5d;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 031b4e26f2..9630b3f19c 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -149,18 +149,12 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	virtual void exited () {}
 
 	virtual void set_height (uint32_t h);
-	void set_height (Height);
+	void set_height_enum (Height, bool apply_to_selection = false);
 	void reset_height();
 
 	std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double);
 
-	/**
-	 * Steps through the defined heights for this TrackView.
-	 * Sets bigger to true to step up in size, set to fals eot step smaller.
-	 *
-	 * @param bigger true if stepping should increase in size, false otherwise
-	 */
-	virtual void step_height (bool bigger);
+	virtual void step_height (bool);
 
 	virtual ARDOUR::RouteGroup* route_group() const { return 0; }
 	virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
@@ -169,7 +163,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	virtual void show_selection (TimeSelection&);
 	virtual void hide_selection ();
 	virtual void reshow_selection (TimeSelection&);
-	virtual void show_timestretch (nframes_t start, nframes_t end);
+	virtual void show_timestretch (framepos_t start, framepos_t end);
 	virtual void hide_timestretch ();
 
 	virtual void hide_dependent_views (TimeAxisViewItem&) {}
@@ -183,7 +177,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	virtual void set_selected_regionviews (RegionSelection&) {}
 	virtual void set_selected_points (PointSelection&) {}
 
-	virtual boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
+	virtual boost::shared_ptr<ARDOUR::Region> find_next_region (framepos_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
 		return boost::shared_ptr<ARDOUR::Region> ();
 	}
 
@@ -206,12 +200,13 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	/* call this on the parent */
 
-	virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter /*param*/) { return 0; }
+	virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter) { return 0; }
 
 	virtual LayerDisplay layer_display () const { return Overlaid; }
 	virtual StreamView* view () const { return 0; }
 
 	typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
+	Children get_child_list ();
 
 	SelectionRect* get_selection_rect(uint32_t id);
 
@@ -309,6 +304,9 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	void conditionally_add_to_selection ();
 
+	void build_size_menu ();
+	Gtk::Menu* _size_menu;
+
 	ArdourCanvas::Group* _canvas_display;
 	double _y_position;
 	PublicEditor& _editor;