mackie: semi-working Sends subview mode

[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.h

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index b8940d650c151e81b39470c0258a18aadce61b34..d418871d6a3cc25c639958c31774c49186907d9b 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -109,6 +109,7 @@ class MackieControlProtocol
                Busses,
                Auxes,
                Selected,
+               Hidden,
                Plugins,
        };
 
@@ -116,11 +117,11 @@ class MackieControlProtocol
                None,
                EQ,
                Dynamics,
+               Sends,
        };
 
        enum PotMode {
                Trim,
-               Send,
                Pan,
        };
 
@@ -160,6 +161,7 @@ class MackieControlProtocol
        bool is_audio_track (boost::shared_ptr<ARDOUR::Route>) const;
        bool is_midi_track (boost::shared_ptr<ARDOUR::Route>) const;
        bool selected (boost::shared_ptr<ARDOUR::Route>) const;
+       bool is_hidden (boost::shared_ptr<ARDOUR::Route>) const;
        boost::shared_ptr<ARDOUR::Route> first_selected_route () const;
 
        void set_view_mode (ViewMode);
@@ -178,6 +180,7 @@ class MackieControlProtocol
        */
 
        static bool probe();
+       static void* request_factory (uint32_t);
 
        mutable Glib::Threads::Mutex surfaces_lock;
        typedef std::list<boost::shared_ptr<Mackie::Surface> > Surfaces;
@@ -201,6 +204,7 @@ class MackieControlProtocol
 
        void handle_button_event (Mackie::Surface&, Mackie::Button& button, Mackie::ButtonState);
 
+       void notify_subview_route_deleted ();
        void notify_route_added_or_removed ();
        void notify_route_added (ARDOUR::RouteList &);
        void notify_remote_id_changed();
@@ -318,6 +322,7 @@ class MackieControlProtocol
        PBD::ScopedConnectionList audio_engine_connections;
        PBD::ScopedConnectionList session_connections;
        PBD::ScopedConnectionList route_connections;
+       PBD::ScopedConnectionList subview_route_connections;
        PBD::ScopedConnectionList gui_connections;
        // timer for two quick marker left presses
        Mackie::Timer            _frm_left_last;
@@ -420,8 +425,6 @@ class MackieControlProtocol
        Mackie::LedState channel_right_release(Mackie::Button &);
        Mackie::LedState clicking_press(Mackie::Button &);
        Mackie::LedState clicking_release(Mackie::Button &);
-       Mackie::LedState global_solo_press(Mackie::Button &);
-       Mackie::LedState global_solo_release(Mackie::Button &);
        Mackie::LedState marker_press(Mackie::Button &);
        Mackie::LedState marker_release(Mackie::Button &);
        Mackie::LedState save_press(Mackie::Button &);