MCP: Patch from Rodrigo that:

[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 238c9c4aa5bcba10c0ce01b467bd519748b8da93..eb3cc22b8cfe38cc519516f46744ca1578315a02 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -38,7 +38,7 @@
 #include "types.h"
 #include "midi_byte_array.h"
 #include "controls.h"
-#include "mackie_jog_wheel.h"
+#include "jog_wheel.h"
 #include "timer.h"
 #include "device_info.h"
 #include "device_profile.h"
@@ -119,14 +119,16 @@ class MackieControlProtocol
        static MackieControlProtocol* instance() { return _instance; }
        
        const Mackie::DeviceInfo& device_info() const { return _device_info; }
-       const Mackie::DeviceProfile& device_profile() const { return _device_profile; }
+       Mackie::DeviceProfile& device_profile() { return _device_profile; }
 
        int set_active (bool yn);
-       void set_device (const std::string&);
+       void set_device (const std::string&, bool allow_activation = true);
        void set_profile (const std::string&);
 
        bool     flip_mode () const { return _flip_mode; }
        ViewMode view_mode () const { return _view_mode; }
+       bool zoom_mode () const { return _zoom_mode; }
+       bool     metering_active () const { return _metering_active; }
 
        void set_view_mode (ViewMode);
        void set_flip_mode (bool);
@@ -144,7 +146,7 @@ class MackieControlProtocol
        void set_master_on_surface_strip (uint32_t surface, uint32_t strip);
        void set_monitor_on_surface_strip (uint32_t surface, uint32_t strip);
        
-       uint32_t n_strips () const;
+       uint32_t n_strips (bool with_locked_strips = true) const;
        
        bool has_editor () const { return true; }
        void* get_gui () const;
@@ -163,6 +165,7 @@ class MackieControlProtocol
        void notify_record_state_changed();
        void notify_transport_state_changed();
        void notify_loop_state_changed();
+       void notify_metering_state_changed();
        // mainly to pick up punch-in and punch-out
        void notify_parameter_changed(std::string const &);
        void notify_solo_active_changed(bool);
@@ -170,7 +173,7 @@ class MackieControlProtocol
        /// Turn timecode on and beats off, or vice versa, depending
        /// on state of _timecode_type
        void update_timecode_beats_led();
-  
+       
        /// this is called to generate the midi to send in response to a button press.
        void update_led(Mackie::Surface&, Mackie::Button & button, Mackie::LedState);
   
@@ -191,6 +194,11 @@ class MackieControlProtocol
        void add_down_select_button (int surface, int strip);
        void remove_down_select_button (int surface, int strip);
        void select_range ();
+
+       int16_t ipmidi_base() const { return _ipmidi_base; }
+       void    set_ipmidi_base (int16_t);
+
+       void midi_connectivity_established ();
        
   protected:
        // shut down the surface
@@ -230,9 +238,7 @@ class MackieControlProtocol
 
        void thread_init ();
 
-       /* handling function key presses */
-
-       void f_press (uint32_t fn);
+       bool route_is_locked_to_strip (boost::shared_ptr<ARDOUR::Route>) const;
 
   private:
 
@@ -280,19 +286,23 @@ class MackieControlProtocol
        int                      _modifier_state;
        PortSources               port_sources;
        ButtonMap                 button_map;
+       int16_t                  _ipmidi_base;
+       bool                      needs_ipmidi_restart;
+       bool                     _metering_active;
+
+       ARDOUR::RouteNotificationList _last_selected_routes;
 
        void create_surfaces ();
-       void port_connected_or_disconnected (std::string, std::string, bool);
        bool periodic();
        void build_gui ();
        bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
        void clear_ports ();
        void force_special_route_to_strip (boost::shared_ptr<ARDOUR::Route> r, uint32_t surface, uint32_t strip_number);
        void build_button_map ();
-
-       void gui_track_selection_changed (ARDOUR::RouteNotificationListPtr);
-
-
+       void gui_track_selection_changed (ARDOUR::RouteNotificationListPtr, bool save_list);
+       void _gui_track_selection_changed (ARDOUR::RouteNotificationList*, bool save_list);
+       void ipmidi_restart ();
+       
        /* BUTTON HANDLING */
 
        typedef std::set<uint32_t> DownButtonList;