X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=4be23803efe424608df596633ac3f3ee3e6ebe2d;hb=ad35ab78ebafdf5fe82ad05f31476d4fa23fcb77;hp=6827251472b8fe9ee09f37a8b348b27eba10eb4b;hpb=9e0cd98ad4fc84e56640ea9a466d3fd0dbccef04;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 6827251472..4be23803ef 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -142,7 +142,13 @@ class TimeAxisView : public virtual AxisView
 	virtual void entered () {}
 	virtual void exited () {}
 
-	virtual void set_height (uint32_t h);
+	enum TrackHeightMode {
+		OnlySelf,
+		TotalHeight,
+		HeightPerLane
+	};
+
+	virtual void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
 	void set_height_enum (Height, bool apply_to_selection = false);
 	void reset_height();
 
@@ -251,8 +257,11 @@ class TimeAxisView : public virtual AxisView
 	bool name_entry_key_release (GdkEventKey *ev);
 	bool name_entry_key_press (GdkEventKey *ev);
 	bool name_entry_focus_out (GdkEventFocus *ev);
+	void name_entry_populate_popup (Gtk::Menu *);
 
 	Gtk::Entry* name_entry;
+	bool ending_name_edit;
+	bool by_popup_menu;
 	void begin_name_edit ();
 	void end_name_edit (int);