diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-08 21:54:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-08 21:55:38 -0400 |
| commit | 8338fd8ac618e899756017f700642f78dc8f059b (patch) | |
| tree | 7d995bfda1b8e30d02d1e5842f0368d3e4e5f872 | |
| parent | 36088b53b147aab0965de900edab730006e3049e (diff) | |
add DeviceChanged signal to MCP and make surface lock mutable for use in const methods.
Also add nth_surface() API to MackieControlProtocol
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 8 |
1 files 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<void> 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<boost::shared_ptr<Mackie::Surface> > Surfaces; Surfaces surfaces; + boost::shared_ptr<Mackie::Surface> nth_surface (uint32_t) const; + std::list<boost::shared_ptr<ARDOUR::Bundle> > bundles (); void set_master_on_surface_strip (uint32_t surface, uint32_t strip); |