X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=f33379e4d63bc2660150b1d5a69f11d24721bf49;hb=66e580d683a1bd7e63ee159f40e8e16a4fc0bf7f;hp=c2b885302bc95301f20341783074c7d001f52b69;hpb=260058a4a966462fe4835b15f31aa2ac3dcfd8d3;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index c2b885302b..f33379e4d6 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -105,9 +105,6 @@ class TimeAxisView : public virtual AxisView
 
 	static void setup_sizes ();
 
-	virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
-	virtual ARDOUR::PresentationInfo const & presentation_info () const = 0;
-
 	/** @return index of this TimeAxisView within its parent */
 	int order () const { return _order; }
 
@@ -140,6 +137,7 @@ class TimeAxisView : public virtual AxisView
 	bool hidden () const { return _hidden; }
 
 	void set_selected (bool);
+
 	virtual bool selectable() const { return true; }
 
 	/**
@@ -187,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&) {}
@@ -220,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:
@@ -237,7 +234,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 */
@@ -308,7 +304,7 @@ class TimeAxisView : public virtual AxisView
 
 	void build_size_menu ();
 
-private:
+  private:
 	Gtk::VBox*            control_parent;
 	int                  _order;
 	uint32_t             _effective_height;
@@ -322,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);