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/ardour | |
| 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/ardour')
| -rw-r--r-- | libs/ardour/ardour/stripable.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/vca.h | 2 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index cebe91a576..0ebd1f55ad 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -104,7 +104,7 @@ class LIBARDOUR_API Stripable : public SessionObject { virtual boost::shared_ptr<GainControl> trim_control() const = 0; virtual boost::shared_ptr<MonitorControl> monitoring_control() const = 0; - virtual boost::shared_ptr<AutomationControl> recenable_control() const { return boost::shared_ptr<AutomationControl>(); } + virtual boost::shared_ptr<AutomationControl> rec_enable_control() const { return boost::shared_ptr<AutomationControl>(); } /* "well-known" controls for panning. Any or all of these may return * null. diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 65de6fb9ef..1583e453fc 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -104,7 +104,7 @@ class LIBARDOUR_API VCA : public Stripable, virtual boost::shared_ptr<GainControl> gain_control() const { return _gain_control; } virtual boost::shared_ptr<SoloControl> solo_control() const { return _solo_control; } virtual boost::shared_ptr<MuteControl> mute_control() const { return _mute_control; } - virtual boost::shared_ptr<AutomationControl> recenable_control() const { return _recenable_control; } + virtual boost::shared_ptr<AutomationControl> rec_enable_control() const { return _recenable_control; } virtual boost::shared_ptr<MonitorControl> monitoring_control() const { return _monitor_control; } /* null Stripable API, because VCAs don't have any of this */ diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 55258a3ead..54cb87b82f 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3464,7 +3464,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) break; case ControllableDescriptor::Recenable: - c = s->recenable_control (); + c = s->rec_enable_control (); break; case ControllableDescriptor::PanDirection: |