X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=f33379e4d63bc2660150b1d5a69f11d24721bf49;hb=7701207123891b400c144db880b77dc698a202ea;hp=ad9add448490197030a2b68312d91bd917d7db6a;hpb=e626db22a0a1dffc60c0acd2d10ae00bc07468a3;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index ad9add4484..f33379e4d6 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -39,7 +39,9 @@
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
+#include "ardour/presentation_info.h"
 #include "ardour/region.h"
+
 #include "evoral/Parameter.hpp"
 
 #include "canvas/line.h"
@@ -55,6 +57,7 @@ namespace ARDOUR {
 	class Session;
 	class RouteGroup;
 	class Playlist;
+	class Stripable;
 }
 
 namespace Gtk {
@@ -134,6 +137,7 @@ class TimeAxisView : public virtual AxisView
 	bool hidden () const { return _hidden; }
 
 	void set_selected (bool);
+
 	virtual bool selectable() const { return true; }
 
 	/**
@@ -181,7 +185,8 @@ class TimeAxisView : public virtual AxisView
 	 */
 	virtual bool paste (ARDOUR::framepos_t pos,
 	                    const Selection&   selection,
-	                    PasteContext&      ctx) { return false; }
+	                    PasteContext&      ctx,
+			    const int32_t sub_num) { return false; }
 
 	virtual void set_selected_regionviews (RegionSelection&) {}
 	virtual void set_selected_points (PointSelection&) {}
@@ -214,8 +219,6 @@ class TimeAxisView : public virtual AxisView
 	typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
 	Children get_child_list ();
 
-	SelectionRect* get_selection_rect(uint32_t id);
-
 	static uint32_t preset_height (Height);
 
 	protected:
@@ -230,9 +233,7 @@ class TimeAxisView : public virtual AxisView
 	Gtk::VBox              time_axis_vbox;
 	Gtk::HBox              time_axis_hbox;
 	Gtk::Frame             time_axis_frame;
-	Gtk::HBox              name_hbox;
 	Gtk::HBox              top_hbox;
-	Gtk::Label             name_label;
 	Gtk::Fixed             scroomer_placeholder;
 	bool                  _name_editing;
 	uint32_t               height;  /* in canvas units */
@@ -255,20 +256,12 @@ class TimeAxisView : public virtual AxisView
 
 	virtual bool can_edit_name() const;
 
-	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);
+	void end_name_edit (std::string, int);
 
 	/* derived classes can override these */
 
-	virtual void name_entry_changed ();
+	virtual bool name_entry_changed (std::string const&);
 
 	/** Handle mouse relaese on our LHS control name ebox.
 	 *
@@ -311,7 +304,7 @@ class TimeAxisView : public virtual AxisView
 
 	void build_size_menu ();
 
-private:
+  private:
 	Gtk::VBox*            control_parent;
 	int                  _order;
 	uint32_t             _effective_height;
@@ -325,6 +318,8 @@ private:
 	static uint32_t extra_height;
 	static int const _max_order;
 
+	SelectionRect* get_selection_rect(uint32_t id);
+
 	void compute_heights ();
 	bool maybe_set_cursor (int y);