Merge branch 'master' into cairocanvas

[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 080aef1e3decf926c0571aedf567d0ac2f45b75a..4ff5d53f2567ab7b2ddef8cd792b64d2c28f7b7f 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -28,6 +28,7 @@
 #include <pthread.h>
 #include <boost/smart_ptr.hpp>
 
+#define ABSTRACT_UI_EXPORTS
 #include "pbd/abstract_ui.h"
 #include "midi++/types.h"
 #include "ardour/types.h"
@@ -120,22 +121,23 @@ class MackieControlProtocol
        Mackie::DeviceProfile& device_profile() { return _device_profile; }
 
        int set_active (bool yn);
-       void set_device (const std::string&, bool allow_activation = true);
-       void set_profile (const std::string&);
+       int  set_device (const std::string&);
+        void set_profile (const std::string&);
 
-       bool     flip_mode () const { return _flip_mode; }
+       FlipMode 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);
+       void set_flip_mode (FlipMode);
 
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
   
        static bool probe();
        
+        Glib::Threads::Mutex surfaces_lock;
        typedef std::list<boost::shared_ptr<Mackie::Surface> > Surfaces;
        Surfaces surfaces;
 
@@ -261,7 +263,6 @@ class MackieControlProtocol
        uint32_t                 _current_initial_bank;
        PBD::ScopedConnectionList audio_engine_connections;
        PBD::ScopedConnectionList session_connections;
-       PBD::ScopedConnectionList port_connections;
        PBD::ScopedConnectionList route_connections;
        PBD::ScopedConnectionList gui_connections;
        // timer for two quick marker left presses
@@ -277,7 +278,7 @@ class MackieControlProtocol
        void*                    _gui;
        bool                     _zoom_mode;
        bool                     _scrub_mode;
-       bool                     _flip_mode;
+       FlipMode                 _flip_mode;
        ViewMode                 _view_mode;
        int                      _current_selected_track;
        int                      _modifier_state;
@@ -287,21 +288,24 @@ class MackieControlProtocol
        bool                      needs_ipmidi_restart;
        bool                     _metering_active;
        bool                     _initialized;
-
        ARDOUR::RouteNotificationList _last_selected_routes;
+        XMLNode*                 _surfaces_state;
+        int                      _surfaces_version;
 
-       void create_surfaces ();
+       int create_surfaces ();
        bool periodic();
        void build_gui ();
        bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
        void clear_ports ();
+       void clear_surfaces ();
        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, bool save_list);
        void _gui_track_selection_changed (ARDOUR::RouteNotificationList*, bool save_list);
-       void ipmidi_restart ();
-       void initialize ();
-       
+       int ipmidi_restart ();
+        void initialize ();
+        int set_device_info (const std::string& device_name);
+
        /* BUTTON HANDLING */
 
        typedef std::set<uint32_t> DownButtonList;