diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-13 07:33:20 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-13 07:33:27 -0400 |
| commit | 3169ac0444563ff3ab8c549df0d798aad088e942 (patch) | |
| tree | 0d5762286c835cdfbc2a0fcb85edc648a9bd7b60 /libs/surfaces/mackie/mackie_control_protocol.h | |
| parent | fbdb4c602ebd9be2c567825d27bc259cf96505f6 (diff) | |
fix the design of Mackie XML state management
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 18069dc591..530f328951 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -231,9 +231,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 +322,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 +349,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 */ |