X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=3a5bc34250e8c2eda23e088ece75352913ee12a6;hb=01e0f512232fe73c18339f368c90f581a5bebdb2;hp=27e816738f2bea8f8d75d9254acbc94471ba8995;hpb=9c733915a0bc4b5274fac749b1adc874da79a6ee;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 27e816738f..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&);
@@ -94,7 +97,7 @@ public:
 	/* Editing operations */
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
 	bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
-	void combine_regions ();
+	RegionView* combine_regions ();
 	void uncombine_regions ();
 	void uncombine_region (RegionView*);
 	void toggle_automation_track (const Evoral::Parameter& param);
@@ -112,21 +115,17 @@ public:
 	void add_underlay (StreamView*, bool update_xml = true);
 	void remove_underlay (StreamView*);
 	void build_underlay_menu(Gtk::Menu*);
-	
-	int set_state (const XMLNode&, int version);
-	
-	virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0;
 
-	/* make sure we get the right version of this */
+	int set_state (const XMLNode&, int version);
 
-	XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); }
+	virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0;
 
 	typedef std::map<Evoral::Parameter, boost::shared_ptr<AutomationTimeAxisView> > AutomationTracks;
 	AutomationTracks automation_tracks() { return _automation_tracks; }
 
 	boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
 	virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
-	
+
 	std::string         name() const;
 	StreamView*         view() const { return _view; }
 	ARDOUR::RouteGroup* route_group() const;
@@ -141,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;
@@ -187,7 +186,7 @@ protected:
 	                                       boost::shared_ptr<ARDOUR::Processor>);
 
 	void automation_track_hidden (Evoral::Parameter param);
-	
+
 	ProcessorAutomationNode*
 	find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, Evoral::Parameter);
 
@@ -212,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 ();
@@ -233,29 +230,26 @@ 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;
-	
+
 	StreamView*           _view;
 	ArdourCanvas::Canvas& parent_canvas;
 	bool                  no_redraw;
 
 	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;
@@ -274,6 +268,9 @@ protected:
 
 	void set_track_mode (ARDOUR::TrackMode, bool apply_to_selection = false);
 
+	/** Information about all automatable processor parameters that apply to
+	 *  this route.  The Amp processor is not included in this list.
+	 */
 	std::list<ProcessorAutomationInfo*> processor_automation;
 
 	typedef std::vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
@@ -290,8 +287,6 @@ protected:
 
 	GainMeterBase gm;
 
-	static Glib::RefPtr<Gdk::Pixbuf> slider;
-
 	XMLNode* underlay_xml_node;
 	bool set_underlay_state();
 
@@ -300,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__ */