X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=e4e30fdc4f4726b02d8204a832856e57a793e1b6;hb=3099d99e0b9c12c500507cc2e3e14015c7364823;hp=daef126406e19024678fa02f27978a373f2b5989;hpb=eee83c25a9e1e182d0ce1d90f5469b0a836f082c;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index daef126406..e4e30fdc4f 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -57,6 +57,7 @@ namespace ARDOUR {
 	class Session;
 	class RouteGroup;
 	class Playlist;
+	class Stripable;
 }
 
 namespace Gtk {
@@ -104,8 +105,6 @@ class TimeAxisView : public virtual AxisView
 
 	static void setup_sizes ();
 
-	virtual ARDOUR::PresentationInfo const & presentation_info () const = 0;
-
 	/** @return index of this TimeAxisView within its parent */
 	int order () const { return _order; }
 
@@ -138,6 +137,7 @@ class TimeAxisView : public virtual AxisView
 	bool hidden () const { return _hidden; }
 
 	void set_selected (bool);
+
 	virtual bool selectable() const { return true; }
 
 	/**
@@ -185,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&) {}
@@ -235,7 +236,6 @@ class TimeAxisView : public virtual AxisView
 	Gtk::HBox              time_axis_hbox;
 	Gtk::Frame             time_axis_frame;
 	Gtk::HBox              top_hbox;
-	Gtk::Label             name_label;
 	Gtk::Fixed             scroomer_placeholder;
 	bool                  _name_editing;
 	uint32_t               height;  /* in canvas units */
@@ -306,7 +306,7 @@ class TimeAxisView : public virtual AxisView
 
 	void build_size_menu ();
 
-private:
+  private:
 	Gtk::VBox*            control_parent;
 	int                  _order;
 	uint32_t             _effective_height;