X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=48af0f82b25c42ef376ec9b5309329bcaf5674fb;hb=ff5cc4a3115f43443cebfc325d175e3cdddeafed;hp=50070c537a17f72225b6296df63bad1d89716d3c;hpb=5c926136988757f1f11a14c11720ed3daac3195f;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 50070c537a..48af0f82b2 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -32,9 +32,6 @@
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/adjustment.h>
 
-#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/slider_controller.h>
-
 #include "widgets/ardour_button.h"
 
 #include "ardour/playlist.h"
@@ -93,22 +90,22 @@ public:
 
 	void set_samples_per_pixel (double);
 	void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
-	void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
+	void show_timestretch (samplepos_t start, samplepos_t end, int layers, int layer);
 	void hide_timestretch ();
 	void selection_click (GdkEventButton*);
 	void set_selected_points (PointSelection&);
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
+	void get_selectables (ARDOUR::samplepos_t start, ARDOUR::samplepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>&);
 	void set_layer_display (LayerDisplay d, bool apply_to_selection = false);
 	LayerDisplay layer_display () const;
 
-	boost::shared_ptr<ARDOUR::Region> find_next_region (framepos_t pos, ARDOUR::RegionPoint, int32_t dir);
-	framepos_t find_next_region_boundary (framepos_t pos, int32_t dir);
+	boost::shared_ptr<ARDOUR::Region> find_next_region (samplepos_t pos, ARDOUR::RegionPoint, int32_t dir);
+	samplepos_t find_next_region_boundary (samplepos_t pos, int32_t dir);
 
 	/* Editing operations */
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
-	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
+	bool paste (ARDOUR::samplepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
 	RegionView* combine_regions ();
 	void uncombine_regions ();
 	void uncombine_region (RegionView*);
@@ -179,7 +176,7 @@ protected:
 
 	bool route_group_click  (GdkEventButton *);
 
-	void processors_changed (ARDOUR::RouteProcessorChange);
+	virtual void processors_changed (ARDOUR::RouteProcessorChange);
 
 	virtual void add_processor_to_subplugin_menu (boost::weak_ptr<ARDOUR::Processor>);
 	void remove_processor_automation_node (ProcessorAutomationNode* pan);
@@ -231,7 +228,7 @@ protected:
 	virtual void show_existing_automation (bool apply_to_selection = false);
 	virtual void hide_all_automation (bool apply_to_selection = false);
 
-	void timestretch (framepos_t start, framepos_t end);
+	void timestretch (samplepos_t start, samplepos_t end);
 	void speed_changed ();
 	void map_frozen ();
 	void color_handler ();
@@ -267,10 +264,6 @@ protected:
 
 	ArdourCanvas::Rectangle* timestretch_rect;
 
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	void set_track_mode (ARDOUR::TrackMode, bool apply_to_selection = false);
-#endif
-
 	/** Information about all automatable processor parameters that apply to
 	 *  this route.  The Amp processor is not included in this list.
 	 */
@@ -313,6 +306,10 @@ private:
 	void update_playlist_tip ();
 	void parameter_changed (std::string const & p);
 	void update_track_number_visibility();
+
+	void drop_instrument_ref ();
+	void reread_midnam ();
+	PBD::ScopedConnectionList midnam_connection;
 };
 
 #endif /* __ardour_route_time_axis_h__ */