diff options
| author | David Robillard <d@drobilla.net> | 2009-02-15 20:31:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-15 20:31:05 +0000 |
| commit | 59972b5550b0dbfb738a1acfd46c5764f96a3da5 (patch) | |
| tree | a33e3212899947c83b5f59d6c5e549e923d0f914 /libs | |
| parent | 9c89a93e4f96826bec6ed519f8f435e4fc73bfa5 (diff) | |
Factor out region layering.
Correctly layer automation regions to match the stacking of their 'real' counterparts.
git-svn-id: svn://localhost/ardour2/branches/3.0@4585 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 1 | ||||
| -rw-r--r-- | libs/evoral/evoral/midi_util.h | 2 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index f960c170db..ff6d05a4ac 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1508,3 +1508,4 @@ MidiDiskstream::get_playback(MidiBuffer& dst, nframes_t start, nframes_t end, nf _midi_state_tracker.resolve_notes(dst, end-start - 1 + offset); } } + diff --git a/libs/evoral/evoral/midi_util.h b/libs/evoral/evoral/midi_util.h index 3d6ac095bb..5dfc3c70fd 100644 --- a/libs/evoral/evoral/midi_util.h +++ b/libs/evoral/evoral/midi_util.h @@ -26,7 +26,7 @@ namespace Evoral { /** Return the size of the given event including the status byte, - * or -1 if unknown (eg sysex) + * or -1 if unknown (e.g. sysex) */ static inline int midi_event_size(unsigned char status) diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index ffe5de9f70..01aca0e4a4 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -134,7 +134,7 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t << "], event ignored" << endl; continue; } -#endif + #endif const ControlIterator new_iter(i->second->list(), x, y); @@ -265,7 +265,7 @@ Sequence<Time>::const_iterator::operator++() if (! (ev.is_note() || ev.is_cc() || ev.is_pgm_change() || ev.is_pitch_bender() || ev.is_channel_pressure() || ev.is_sysex()) ) { - cerr << "Unknown event type: " << hex << int(ev.buffer()[0]) + cerr << "WARNING: Unknown event type: " << hex << int(ev.buffer()[0]) << int(ev.buffer()[1]) << int(ev.buffer()[2]) << endl; } |