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/evoral/src/Sequence.cpp | |
| 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/evoral/src/Sequence.cpp')
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index fca4879322..dd891a0ac2 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -35,6 +35,7 @@ #include "evoral/ControlList.hpp" #include "evoral/ControlSet.hpp" #include "evoral/EventSink.hpp" +#include "evoral/ParameterDescriptor.hpp" #include "evoral/Sequence.hpp" #include "evoral/TypeMap.hpp" #include "evoral/midi_util.h" @@ -140,9 +141,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t assert(x >= 0); - if (y < i->first.min() || y > i->first.max()) { + const ParameterDescriptor& desc = seq.type_map().descriptor(i->first); + if (y < desc.lower || y > desc.upper) { cerr << "ERROR: Controller value " << y - << " out of range [" << i->first.min() << "," << i->first.max() + << " out of range [" << desc.lower << "," << desc.upper << "], event ignored" << endl; continue; } |