X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=99ed2f37fc8f600812713c66cf51d37d85ad9e18;hb=7d553eea8028977021f1526b8ab538737a21767c;hp=1eb193590c9d63f9e775e2b43672c11f899b292d;hpb=9c6a821c67139a32b531501e0fd000ec19c89faf;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 1eb193590c..99ed2f37fc 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -33,18 +33,19 @@
 #include <gtkmm/label.h>
 #include <gtkmm/sizegroup.h>
 
-#include <gtkmm2ext/focus_entry.h>
-
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
 
+#include "evoral/Parameter.hpp"
+
 #include "ardour/types.h"
+#include "ardour/presentation_info.h"
 #include "ardour/region.h"
-#include "evoral/Parameter.hpp"
 
 #include "canvas/line.h"
 
-#include "prompter.h"
+#include "widgets/focus_entry.h"
+
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
@@ -55,6 +56,7 @@ namespace ARDOUR {
 	class Session;
 	class RouteGroup;
 	class Playlist;
+	class Stripable;
 }
 
 namespace Gtk {
@@ -135,6 +137,8 @@ class TimeAxisView : public virtual AxisView
 
 	void set_selected (bool);
 
+	virtual bool selectable() const { return true; }
+
 	/**
 	 * potential handler for entered events
 	 */
@@ -180,10 +184,11 @@ 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&) {}
+	virtual void set_selected_points (PointSelection&);
 
 	virtual void fade_range (TimeSelection&) {}
 
@@ -211,9 +216,7 @@ class TimeAxisView : public virtual AxisView
 	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);
+	Children get_child_list () const;
 
 	static uint32_t preset_height (Height);
 
@@ -229,9 +232,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 */
@@ -254,18 +255,13 @@ 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);
-
-	Gtk::Entry* name_entry;
-	bool ending_name_edit;
 	void begin_name_edit ();
-	void end_name_edit (int);
+	void end_name_edit (std::string, int);
+	virtual std::string name () const { return name_label.get_text (); }
 
 	/* 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.
 	 *
@@ -294,6 +290,7 @@ class TimeAxisView : public virtual AxisView
 
 	Children children;
 	bool is_child (TimeAxisView*);
+	virtual bool propagate_time_selection () const { return false; }
 
 	virtual void remove_child (boost::shared_ptr<TimeAxisView>);
 	void add_child (boost::shared_ptr<TimeAxisView>);
@@ -308,7 +305,7 @@ class TimeAxisView : public virtual AxisView
 
 	void build_size_menu ();
 
-private:
+  private:
 	Gtk::VBox*            control_parent;
 	int                  _order;
 	uint32_t             _effective_height;
@@ -322,6 +319,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);