From 8338fd8ac618e899756017f700642f78dc8f059b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 8 Oct 2015 21:54:40 -0400 Subject: [PATCH] add DeviceChanged signal to MCP and make surface lock mutable for use in const methods. Also add nth_surface() API to MackieControlProtocol --- libs/surfaces/mackie/mackie_control_protocol.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 70b8f35ad2..9b85c278b3 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -115,7 +115,7 @@ class MackieControlProtocol PlugIn, EQ, Instrument, - }; + }; enum FlipMode { Normal, /* fader controls primary, vpot controls secondary */ @@ -132,6 +132,8 @@ class MackieControlProtocol const Mackie::DeviceInfo& device_info() const { return _device_info; } Mackie::DeviceProfile& device_profile() { return _device_profile; } + PBD::Signal0 DeviceChanged; + void device_ready (); int set_active (bool yn); @@ -158,10 +160,12 @@ class MackieControlProtocol static bool probe(); - Glib::Threads::Mutex surfaces_lock; + mutable Glib::Threads::Mutex surfaces_lock; typedef std::list > Surfaces; Surfaces surfaces; + boost::shared_ptr nth_surface (uint32_t) const; + std::list > bundles (); void set_master_on_surface_strip (uint32_t surface, uint32_t strip);