Remove wrong asserts

[ardour.git] / gtk2_ardour / route_ui.h

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 4a17ac22bef992e22d5d0181bf9d701ed6e8fc4a..e05db7f67708f4f7b633f91b4e4a368af1225425 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -56,6 +56,7 @@ namespace Gtk {
 class ArdourButton;
 class ArdourWindow;
 class IOSelectorWindow;
+class ControlSlaveUI;
 
 class RoutePinWindowProxy : public WM::ProxyBase
 {
@@ -73,13 +74,15 @@ class RoutePinWindowProxy : public WM::ProxyBase
        PBD::ScopedConnection going_away_connection;
 };
 
-class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual sigc::trackable, public virtual PBD::ScopedConnectionList
+class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual Selectable, public virtual sigc::trackable
 {
   public:
        RouteUI (ARDOUR::Session*);
 
        virtual ~RouteUI();
 
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const;
+
        virtual void set_route (boost::shared_ptr<ARDOUR::Route>);
        virtual void set_button_names () = 0;
 
@@ -123,7 +126,6 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual sigc::tr
         ArdourButton* solo_safe_led;
         ArdourButton* solo_isolated_led;
 
-       ArdourButton* vca_button;
 
        Gtk::Label monitor_input_button_label;
        Gtk::Label monitor_disk_button_label;
@@ -238,8 +240,6 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual sigc::tr
 
        void update_solo_display ();
 
-       void update_vca_display ();
-
        virtual void map_frozen ();
 
        void adjust_latency ();
@@ -287,7 +287,7 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual sigc::tr
         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 ();
@@ -305,7 +305,7 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual sigc::tr
 
        std::string route_state_id () const;
 
-protected:
+  protected:
        struct SoloMuteRelease {
            SoloMuteRelease (bool was_active)
            : active (was_active)
@@ -322,6 +322,8 @@ protected:
        SoloMuteRelease* _solo_release;
        SoloMuteRelease* _mute_release;
 
+       ControlSlaveUI* csu;
+
 private:
        void setup_invert_buttons ();
        void set_invert_button_state ();