diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2009-01-28 04:55:31 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2009-01-28 04:55:31 +0000 |
| commit | 3705a2d6307cf443acbf8419b0e0f560591f2016 (patch) | |
| tree | 0702629940e808aa553d1d344ac49dac2d7ca9c2 /libs/evoral | |
| parent | 6c538ab719c49262da159e9568bb1f8fb30e1518 (diff) | |
* MIDI control lanes: Set Interpolationtype according to Parameter
git-svn-id: svn://localhost/ardour2/branches/3.0@4452 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral')
| -rw-r--r-- | libs/evoral/evoral/midi_events.h | 4 | ||||
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 3 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libs/evoral/evoral/midi_events.h b/libs/evoral/evoral/midi_events.h index d0329cdaf8..a235d9a3fc 100644 --- a/libs/evoral/evoral/midi_events.h +++ b/libs/evoral/evoral/midi_events.h @@ -100,8 +100,8 @@ #define MIDI_CTL_ALL_NOTES_OFF 0x7B /**< All Notes Off */ #define MIDI_CTL_OMNI_OFF 0x7C /**< Omni Off */ #define MIDI_CTL_OMNI_ON 0x7D /**< Omni On */ -#define MIDI_CTL_MONO1 0x7E /**< Mono1 */ -#define MIDI_CTL_MONO2 0x7F /**< Mono2 */ +#define MIDI_CTL_MONO 0x7E /**< Monophonic mode */ +#define MIDI_CTL_POLY 0x7F /**< Polyphonic mode */ // Commands #define MIDI_CMD_NOTE_OFF 0x80 /**< Note Off */ diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 022945b0f8..b54e2373f8 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -987,14 +987,17 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double end, assert(x >= start); assert(x < end); + cerr << "returned something" << endl; return true; } else { + cerr << "not between start and end" << endl; return false; } /* No points in range */ } else { + cerr << "no points in range" << endl; return false; } } diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index ce037d985f..6a860ac833 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -630,7 +630,8 @@ Sequence::append_control_unlocked(const Parameter& param, EventTime time, double { debugout << this << " " << _type_map.to_symbol(param) << " @ " << time << " \t= \t" << value << " # controls: " << _controls.size() << endl; - control(param, true)->list()->rt_add(time, value); + boost::shared_ptr<Control> c = control(param, true); + c->list()->rt_add(time, value); } |