diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2018-05-04 08:24:07 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-05-04 08:25:04 -0400 |
| commit | 2e41652e617a9d9e938aca267035bf788d096753 (patch) | |
| tree | eed981850eaa7546cf7cb88ef04c5ced8ad12def /libs/ardour/ardour | |
| parent | 1f9963cd561e1d11301cbf9c9d2294bb30644fe9 (diff) | |
internally, ControllableDescriptors (used by MIDI binding maps) should use enums for automation types, rather than something custom
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/controllable_descriptor.h | 21 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 5 |
2 files changed, 8 insertions, 18 deletions
diff --git a/libs/ardour/ardour/controllable_descriptor.h b/libs/ardour/ardour/controllable_descriptor.h index 9f160227dc..af762473a9 100644 --- a/libs/ardour/ardour/controllable_descriptor.h +++ b/libs/ardour/ardour/controllable_descriptor.h @@ -24,6 +24,7 @@ #include <stdint.h> #include "ardour/libardour_visibility.h" +#include "ardour/types.h" namespace ARDOUR { @@ -38,23 +39,9 @@ public: SelectionCount, }; - enum SubType { - Gain, - Trim, - Solo, - Mute, - Recenable, - PanDirection, - PanWidth, - PanElevation, - Balance, - SendGain, - PluginParameter - }; - ControllableDescriptor () : _top_level_type (PresentationOrderRoute) - , _subtype (Gain) + , _subtype (GainAutomation) , _banked (false) , _bank_offset (0) {} @@ -68,7 +55,7 @@ public: TopLevelType top_level_type() const { return _top_level_type; } const std::string& top_level_name() const { return _top_level_name; } - SubType subtype() const { return _subtype; } + AutomationType subtype() const { return _subtype; } uint32_t presentation_order() const; uint32_t selection_id() const; @@ -79,7 +66,7 @@ public: private: TopLevelType _top_level_type; - SubType _subtype; + AutomationType _subtype; std::string _top_level_name; union { uint32_t _presentation_order; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 4bdab6b070..1d08c5bea3 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -151,7 +151,10 @@ namespace ARDOUR { PhaseAutomation, MonitoringAutomation, BusSendLevel, - BusSendEnable + BusSendEnable, + SendLevelAutomation, /* used only by a controllable descriptor + to refer to gain of a particular send + */ }; enum AutoState { |