diff options
| author | David Robillard <d@drobilla.net> | 2016-11-07 05:14:55 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-12-03 15:28:19 -0500 |
| commit | 398a318934769dae51efe972f7ffdefc52ea2963 (patch) | |
| tree | 5b68a8fac44f0c154e7e00fd45d9e7f2c16e35fb /libs/ardour/event_type_map.cc | |
| parent | bfbc4566ad82573a57e1ec84d583f308ee35eef0 (diff) | |
Fix event type and parameter type confusion
I'm not sure if this is really the best way to do event types (should it
just be a completely static enum in evoral, or completely dynamic and
provided by the type map, or a mix like currently?), but previously the
event type was frequently set to either total garbage, or parameter
types, which are a different thing.
This fixes all those cases, and makes Evoral::EventType an enum so the
compiler will warn about implicit conversions from int.
Diffstat (limited to 'libs/ardour/event_type_map.cc')
| -rw-r--r-- | libs/ardour/event_type_map.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc index 87fe4bc6e1..ca7b51eb27 100644 --- a/libs/ardour/event_type_map.cc +++ b/libs/ardour/event_type_map.cc @@ -62,10 +62,10 @@ EventTypeMap::parameter_midi_type(const Evoral::Parameter& param) const return ARDOUR::parameter_midi_type((AutomationType)param.type()); } -uint32_t -EventTypeMap::midi_event_type(uint8_t status) const +Evoral::ParameterType +EventTypeMap::midi_parameter_type(const uint8_t* buf, uint32_t len) const { - return (uint32_t)ARDOUR::midi_parameter_type(status); + return (uint32_t)ARDOUR::midi_parameter_type(buf[0]); } Evoral::ControlList::InterpolationStyle |