diff options
| author | David Robillard <d@drobilla.net> | 2014-12-30 14:45:11 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-12-30 14:45:11 -0500 |
| commit | 97d344f740925de178655b850f68d44041cce046 (patch) | |
| tree | 4754d7889e4d566083d5fcd800963e36972c02ab /libs/evoral/evoral | |
| parent | c35e94a3c83028220f6eb494fdfe9c1960aaf751 (diff) | |
Fix MIDI CC record/playback crash.
Diffstat (limited to 'libs/evoral/evoral')
| -rw-r--r-- | libs/evoral/evoral/Sequence.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp index 9aded0d9f0..4e6420fbb1 100644 --- a/libs/evoral/evoral/Sequence.hpp +++ b/libs/evoral/evoral/Sequence.hpp @@ -217,7 +217,7 @@ private: public: /** Read iterator */ - class LIBEVORAL_API /* Added by JE - */ const_iterator { + class LIBEVORAL_API const_iterator { public: const_iterator(); const_iterator(const Sequence<Time>& seq, Time t, bool, std::set<Evoral::Parameter> const &); @@ -242,6 +242,9 @@ public: private: friend class Sequence<Time>; + Time choose_next(Time earliest_t); + void set_event(); + typedef std::vector<ControlIterator> ControlIterators; enum MIDIMessageType { NIL, NOTE_ON, NOTE_OFF, CONTROL, SYSEX, PATCH_CHANGE }; |