X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=eb1a212d0e0ec0a05b0b72759e863cc76e69423a;hb=4901f9d1d20ea5878b34db025a3dc305d3a78c2e;hp=b06b56fc67618559feb0e40b3e4fd4cb9f909574;hpb=99aa8c6338e47b41143f799fdcb35d1699548076;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index b06b56fc67..eb1a212d0e 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,9 +71,11 @@ 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 ();
 
@@ -94,7 +97,9 @@ 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);
 
 	/* The editor calls these when mapping an operation across multiple tracks */
@@ -110,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;
@@ -139,6 +140,8 @@ public:
 	void meter_changed ();
 	void effective_gain_display () { gm.effective_gain_display(); }
 
+	std::string state_id() const;
+
 	static void setup_slider_pix ();
 
 protected:
@@ -185,7 +188,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);
 
@@ -210,8 +213,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 ();
@@ -242,18 +243,21 @@ protected:
 
 	void create_gain_automation_child (const Evoral::Parameter &, bool);
 
+	void setup_processor_menu_and_curves ();
+
+	void route_color_changed ();
+
 	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;
@@ -272,6 +276,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;
@@ -299,6 +306,10 @@ protected:
 	UnderlayMirrorList _underlay_mirrors;
 
 	bool _ignore_track_mode_change; ///< true to ignore track mode change signals
+
+private:
+
+	void remove_child (boost::shared_ptr<TimeAxisView>);
 };
 
 #endif /* __ardour_route_time_axis_h__ */