diff options
author | David Robillard <d@drobilla.net> | 2014-12-01 14:28:03 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-01 23:35:24 -0500 |
commit | 767c0238a34ef4acc4d345e88cd5ddb0c8a8e421 (patch) | |
tree | fed11fb6f4e4e08a7c35eb45f53aea70dc66e4f8 /libs/ardour/midi_track.cc | |
parent | cb8abbe8d2f0e4dfe52bd35613ebba7689628eca (diff) |
Replace half-baked param metadata with descriptor.
Among other things, this means that automation controls/lists have the actual
min/max/normal/toggled of parameters, and not those inferred from the Parameter
ID, which is not correct for things like plugin parameters.
Pushing things down to the Evoral::ParmeterDescriptor may be useful in the
future to have lists do smarter things based on parameter range, but currently
I have just pushed down the above-mentioned currently used attributes.
Diffstat (limited to 'libs/ardour/midi_track.cc')
-rw-r--r-- | libs/ardour/midi_track.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index f7294d8e3b..b8fe7ada4c 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -37,6 +37,7 @@ #include "ardour/buffer_set.h" #include "ardour/debug.h" #include "ardour/delivery.h" +#include "ardour/event_type_map.h" #include "ardour/meter.h" #include "ardour/midi_diskstream.h" #include "ardour/midi_playlist.h" @@ -657,16 +658,17 @@ void MidiTrack::MidiControl::set_value(double val) { const Evoral::Parameter ¶meter = _list ? _list->parameter() : Control::parameter(); + const Evoral::ParameterDescriptor &desc = EventTypeMap::instance().descriptor(parameter); bool valid = false; if (isinf_local(val)) { cerr << "MIDIControl value is infinity" << endl; } else if (isnan_local(val)) { cerr << "MIDIControl value is NaN" << endl; - } else if (val < parameter.min()) { - cerr << "MIDIControl value is < " << parameter.min() << endl; - } else if (val > parameter.max()) { - cerr << "MIDIControl value is > " << parameter.max() << endl; + } else if (val < desc.lower) { + cerr << "MIDIControl value is < " << desc.lower << endl; + } else if (val > desc.upper) { + cerr << "MIDIControl value is > " << desc.upper << endl; } else { valid = true; } @@ -675,7 +677,7 @@ MidiTrack::MidiControl::set_value(double val) return; } - assert(val <= parameter.max()); + assert(val <= desc.upper); if ( ! _list || ! automation_playback()) { size_t size = 3; uint8_t ev[3] = { parameter.channel(), uint8_t (val), 0 }; |