X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.h;h=e05db7f67708f4f7b633f91b4e4a368af1225425;hb=1c94f6490e3f0bd4b35a001a9a530cee752100b0;hp=af8db27349e0f85747c0f284d53b9fe40f0a7cca;hpb=f022784014d4ae1b3bb75a1c02f206ba8a28d7d6;p=ardour.git

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index af8db27349..e05db7f677 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -31,8 +31,9 @@
 
 #include "ardour/ardour.h"
 #include "ardour/mute_master.h"
-#include "ardour/session_event.h"
 #include "ardour/session.h"
+#include "ardour/session_event.h"
+#include "ardour/session_handle.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/track.h"
@@ -55,6 +56,7 @@ namespace Gtk {
 class ArdourButton;
 class ArdourWindow;
 class IOSelectorWindow;
+class ControlSlaveUI;
 
 class RoutePinWindowProxy : public WM::ProxyBase
 {
@@ -72,15 +74,14 @@ class RoutePinWindowProxy : public WM::ProxyBase
 	PBD::ScopedConnection going_away_connection;
 };
 
-class RouteUI : public virtual AxisView
+class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual Selectable, public virtual sigc::trackable
 {
   public:
-	RouteUI(ARDOUR::Session*);
-	RouteUI(boost::shared_ptr<ARDOUR::Route>, ARDOUR::Session*);
+	RouteUI (ARDOUR::Session*);
 
 	virtual ~RouteUI();
 
-	Gdk::Color color () const;
+	boost::shared_ptr<ARDOUR::Stripable> stripable() const;
 
 	virtual void set_route (boost::shared_ptr<ARDOUR::Route>);
 	virtual void set_button_names () = 0;
@@ -97,15 +98,14 @@ class RouteUI : public virtual AxisView
 	boost::shared_ptr<ARDOUR::AudioTrack> audio_track() const;
 	boost::shared_ptr<ARDOUR::MidiTrack>  midi_track() const;
 
-	std::string name() const;
-
 	// protected: XXX sigh this should be here
 
 	boost::shared_ptr<ARDOUR::Route> _route;
 
 	void request_redraw ();
 
-	virtual void set_color (const Gdk::Color & c);
+	virtual void set_color (uint32_t c);
+	Gdk::Color route_color () const;
 	void choose_color ();
 
 	bool ignore_toggle;
@@ -126,7 +126,6 @@ class RouteUI : public virtual AxisView
         ArdourButton* solo_safe_led;
         ArdourButton* solo_isolated_led;
 
-	ArdourButton* vca_button;
 
 	Gtk::Label monitor_input_button_label;
 	Gtk::Label monitor_disk_button_label;
@@ -210,7 +209,7 @@ class RouteUI : public virtual AxisView
 	void manage_pins ();
 	void maybe_add_route_print_mgr ();
 
-	virtual void property_changed (const PBD::PropertyChange&);
+	virtual void route_property_changed (const PBD::PropertyChange&) = 0;
 	void route_removed ();
 
 	virtual void route_active_changed () {}
@@ -241,14 +240,11 @@ class RouteUI : public virtual AxisView
 
 	void update_solo_display ();
 
-	void update_vca_display ();
-
 	virtual void map_frozen ();
 
 	void adjust_latency ();
 	bool process_save_template_prompter (ArdourPrompter& prompter, const std::string& dir);
 	void save_as_template ();
-	void open_remote_control_id_dialog ();
 
 	static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr<ARDOUR::Stripable>);
 	static Gtkmm2ext::ActiveState solo_isolate_active_state (boost::shared_ptr<ARDOUR::Stripable>);
@@ -291,7 +287,7 @@ class RouteUI : public virtual AxisView
         void set_invert_sensitive (bool);
 	bool verify_new_route_name (const std::string& name);
 
-	void route_gui_changed (std::string);
+	void route_gui_changed (PBD::PropertyChange const&);
 	virtual void route_color_changed () {}
 
 	void check_rec_enable_sensitivity ();
@@ -300,6 +296,8 @@ class RouteUI : public virtual AxisView
 
 	static std::string program_port_prefix;
 
+	bool mark_hidden (bool yn);
+
   private:
 	void parameter_changed (std::string const &);
 	void relabel_solo_button ();
@@ -307,7 +305,7 @@ class RouteUI : public virtual AxisView
 
 	std::string route_state_id () const;
 
-protected:
+  protected:
 	struct SoloMuteRelease {
 	    SoloMuteRelease (bool was_active)
 	    : active (was_active)
@@ -324,6 +322,8 @@ protected:
 	SoloMuteRelease* _solo_release;
 	SoloMuteRelease* _mute_release;
 
+	ControlSlaveUI* csu;
+
 private:
 	void setup_invert_buttons ();
 	void set_invert_button_state ();