X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=3a5bc34250e8c2eda23e088ece75352913ee12a6;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=beae6b52019f2d91d443fcb131ba8974debaa9ac;hpb=75eeb68e37cc32cd308762c0034557610d89b251;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index beae6b5201..3a5bc34250 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -38,6 +38,7 @@
 #include "ardour/playlist.h"
 #include "ardour/types.h"
 
+#include "ardour_button.h"
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
@@ -70,15 +71,17 @@ class RouteGroupMenu;
 class RouteTimeAxisView : public RouteUI, public TimeAxisView
 {
 public:
- 	RouteTimeAxisView (PublicEditor&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas);
+ 	RouteTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
  	virtual ~RouteTimeAxisView ();
 
+	void set_route (boost::shared_ptr<ARDOUR::Route>);
+
 	void show_selection (TimeSelection&);
 	void set_button_names ();
 
 	void set_samples_per_unit (double);
  	void set_height (uint32_t h);
-	void show_timestretch (framepos_t start, framepos_t end);
+	void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
 	void hide_timestretch ();
 	void selection_click (GdkEventButton*);
 	void set_selected_points (PointSelection&);
@@ -137,7 +140,7 @@ public:
 	void meter_changed ();
 	void effective_gain_display () { gm.effective_gain_display(); }
 
-	static void setup_slider_pix ();
+	std::string state_id() const;
 
 protected:
 	friend class StreamView;
@@ -208,8 +211,6 @@ protected:
 	void reset_samples_per_unit ();
 	void horizontal_position_changed ();
 
-	void set_color (Gdk::Color const &);
-
 	virtual void build_automation_action_menu (bool);
 	virtual void append_extra_display_menu_items () {}
 	void         build_display_menu ();
@@ -229,18 +230,14 @@ protected:
 	virtual void hide_all_automation (bool apply_to_selection = false);
 
 	void timestretch (framepos_t start, framepos_t end);
-
 	void speed_changed ();
-
 	void map_frozen ();
-
 	void color_handler ();
-
 	void region_view_added (RegionView*);
-
 	void create_gain_automation_child (const Evoral::Parameter &, bool);
-
 	void setup_processor_menu_and_curves ();
+	void route_color_changed ();
+        bool can_edit_name() const;
 
 	boost::shared_ptr<AutomationTimeAxisView> gain_track;
 
@@ -250,10 +247,9 @@ protected:
 
 	Gtk::HBox   other_button_hbox;
 	Gtk::Table  button_table;
-	Gtk::Button processor_button;
-	Gtk::Button route_group_button;
-	Gtk::Button playlist_button;
-	Gtk::Button automation_button;
+	ArdourButton route_group_button;
+	ArdourButton playlist_button;
+	ArdourButton automation_button;
 
 	Gtk::Menu           subplugin_menu;
 	Gtk::Menu*          automation_action_menu;
@@ -291,8 +287,6 @@ protected:
 
 	GainMeterBase gm;
 
-	static Glib::RefPtr<Gdk::Pixbuf> slider;
-
 	XMLNode* underlay_xml_node;
 	bool set_underlay_state();
 
@@ -301,7 +295,12 @@ protected:
 	typedef std::list<RouteTimeAxisView*> UnderlayMirrorList;
 	UnderlayMirrorList _underlay_mirrors;
 
-	bool _ignore_track_mode_change; ///< true to ignore track mode change signals
+	bool _ignore_set_layer_display;
+
+private:
+
+	void remove_child (boost::shared_ptr<TimeAxisView>);
+	void update_playlist_tip ();
 };
 
 #endif /* __ardour_route_time_axis_h__ */