diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-24 11:54:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:45 -0400 |
| commit | 28afaebdc4e25602dfc2d9dc73be9029fe445884 (patch) | |
| tree | 09df8b50fd9066aaf00b4a4e3eb62a7d1cc0e182 /libs/surfaces/mackie | |
| parent | 983a8f3f3c2a92b1a4781504087a05b488056465 (diff) | |
fix SNAFU in which Stripable::rec_enable_control() was incorrectly defined as ::recenable_control()
Make Mackie support code use the Stripable to access the rec-enable control while we're here
Diffstat (limited to 'libs/surfaces/mackie')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 4ff195d40c..f7c76e89db 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -2197,7 +2197,7 @@ MackieControlProtocol::down_controls (AutomationType p) break; case RecEnableAutomation: for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) { - boost::shared_ptr<AutomationControl> ac = (*s)->recenable_control(); + boost::shared_ptr<AutomationControl> ac = (*s)->rec_enable_control(); if (ac) { controls.push_back (ac); } diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 4fdebb38d7..d60f4955b9 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -215,11 +215,11 @@ Strip::set_stripable (boost::shared_ptr<Stripable> r, bool /*with_messages*/) _stripable->gain_control()->Changed.connect(stripable_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_gain_changed, this, false), ui_context()); _stripable->PropertyChanged.connect (stripable_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_property_changed, this, _1), ui_context()); - boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<ARDOUR::Track>(_stripable); + boost::shared_ptr<AutomationControl> rec_enable_control = _stripable->rec_enable_control (); - if (trk) { - _recenable->set_control (trk->rec_enable_control()); - trk->rec_enable_control()->Changed .connect(stripable_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_record_enable_changed, this), ui_context()); + if (rec_enable_control) { + _recenable->set_control (rec_enable_control); + rec_enable_control->Changed.connect (stripable_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_record_enable_changed, this), ui_context()); } // TODO this works when a currently-banked stripable is made inactive, but not |