Add Audio Tracks and Busses too.

[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 18069dc591b2e056fd08616a97b2d30c50ed85db..abdd96bf9077fa9d0345189a735175a0cf9fec67 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -103,19 +103,17 @@ class MackieControlProtocol
 
        enum ViewMode {
                Mixer,
-               Loop,
                AudioTracks,
                MidiTracks,
                Busses,
+               Auxes,
+               Plugins,
        };
 
        enum PotMode {
-               Tracks,
+               Trim,
                Send,
                Pan,
-               PlugIn,
-               EQ,
-               Instrument,
        };
 
        enum FlipMode {
@@ -148,6 +146,10 @@ class MackieControlProtocol
        bool zoom_mode () const { return modifier_state() & MODIFIER_ZOOM; }
        bool     metering_active () const { return _metering_active; }
 
+       bool is_track (boost::shared_ptr<ARDOUR::Route>) const;
+       bool is_audio_track (boost::shared_ptr<ARDOUR::Route>) const;
+       bool is_midi_track (boost::shared_ptr<ARDOUR::Route>) const;
+
        void set_view_mode (ViewMode);
        void set_flip_mode (FlipMode);
        void set_pot_mode (PotMode);
@@ -231,9 +233,6 @@ class MackieControlProtocol
        int16_t ipmidi_base() const { return _ipmidi_base; }
        void    set_ipmidi_base (int16_t);
 
-       bool session_load () { return _session_load; }
-       void not_session_load () { _session_load = false; }
-
        void ping_devices ();
 
   protected:
@@ -325,9 +324,9 @@ class MackieControlProtocol
        bool                     _metering_active;
        bool                     _initialized;
        ARDOUR::RouteNotificationList _last_selected_routes;
-       XMLNode*                                _surfaces_state;
-       int                                             _surfaces_version;
-       bool                                    _session_load;
+       XMLNode*                 configuration_state;
+       int                      state_version;
+
        boost::shared_ptr<ArdourSurface::Mackie::Surface>       _master_surface;
 
         struct ipMIDIHandler {
@@ -352,7 +351,7 @@ class MackieControlProtocol
        int ipmidi_restart ();
         void initialize ();
         int set_device_info (const std::string& device_name);
-       void update_surface_state (boost::shared_ptr<Mackie::Surface>);
+       void update_configuration_state ();
 
        /* MIDI port connection management */