diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-20 16:27:34 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-20 16:27:34 +0000 |
commit | bf91ed99ec2b1231c7150bde7f12c8ca573f0834 (patch) | |
tree | 52423ce3c3606ca76017070e0c2776ead4acd026 /libs/evoral/src | |
parent | 3ef1a678b41725cce49dc0f0f816da445d6d9a76 (diff) |
add note IDs and use them for looking up notes during a history rebuild. NOTE: INVALIDATES OLDER HISTORY FILES
git-svn-id: svn://localhost/ardour2/branches/3.0@7449 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src')
-rw-r--r-- | libs/evoral/src/Event.cpp | 25 | ||||
-rw-r--r-- | libs/evoral/src/Note.cpp | 16 | ||||
-rw-r--r-- | libs/evoral/src/SMF.cpp | 57 | ||||
-rw-r--r-- | libs/evoral/src/Sequence.cpp | 411 |
4 files changed, 303 insertions, 206 deletions
diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp index b64ab7347c..b886d4b39e 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cpp @@ -16,20 +16,42 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <glib.h> #include "evoral/Event.hpp" namespace Evoral { +static event_id_t _event_id_counter = 0; + +event_id_t +event_id_counter() +{ + return g_atomic_int_get (&_event_id_counter); +} + +void +init_event_id_counter(event_id_t n) +{ + g_atomic_int_set (&_event_id_counter, n); +} + +event_id_t +next_event_id () +{ + return g_atomic_int_exchange_and_add (&_event_id_counter, 1); +} + #ifdef EVORAL_EVENT_ALLOC template<typename Timestamp> Event<Timestamp>::Event(EventType type, Timestamp time, uint32_t size, uint8_t* buf, bool alloc) - : _type(type) + : _type(type) , _original_time(time) , _nominal_time(time) , _size(size) , _buf(buf) , _owns_buf(alloc) + , _id (-1) { if (alloc) { _buf = (uint8_t*)malloc(_size); @@ -49,6 +71,7 @@ Event<Timestamp>::Event(const Event& copy, bool owns_buf) , _size(copy._size) , _buf(copy._buf) , _owns_buf(owns_buf) + , _id (copy.id()) { if (owns_buf) { _buf = (uint8_t*)malloc(_size); diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp index ead5d1eff5..62b7da723c 100644 --- a/libs/evoral/src/Note.cpp +++ b/libs/evoral/src/Note.cpp @@ -18,6 +18,7 @@ #include <iostream> #include <limits> +#include <glib.h> #include "evoral/Note.hpp" namespace Evoral { @@ -25,8 +26,8 @@ namespace Evoral { template<typename Time> Note<Time>::Note(uint8_t chan, Time t, Time l, uint8_t n, uint8_t v) // FIXME: types? - : _on_event(0xDE, t, 3, NULL, true) - , _off_event(0xAD, t + l, 3, NULL, true) + : _on_event (0xDE, t, 3, NULL, true) + , _off_event (0xAD, t + l, 3, NULL, true) { assert(chan < 16); @@ -49,9 +50,11 @@ Note<Time>::Note(uint8_t chan, Time t, Time l, uint8_t n, uint8_t v) template<typename Time> Note<Time>::Note(const Note<Time>& copy) - : _on_event(copy._on_event, true) + : _on_event(copy._on_event, true) , _off_event(copy._off_event, true) { + set_id (copy.id()); + assert(_on_event.buffer()); assert(_off_event.buffer()); /* @@ -78,6 +81,13 @@ Note<Time>::~Note() { } +template<typename Time> void +Note<Time>::set_id (event_id_t id) +{ + _on_event.set_id (id); + _off_event.set_id (id); +} + template<typename Time> const Note<Time>& Note<Time>::operator=(const Note<Time>& other) diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp index ef460c2eef..ae3c8781a5 100644 --- a/libs/evoral/src/SMF.cpp +++ b/libs/evoral/src/SMF.cpp @@ -184,6 +184,22 @@ SMF::seek_to_start() const _smf_track->next_event_number = 1; } +static void +midify_note_id (event_id_t note_id, uint8_t* buf) +{ + buf[0] = (note_id & 0xfe000000) >> 25; + buf[1] = (note_id & 0x01fc0000) >> 18; + buf[2] = (note_id & 0x0003f800) >> 11; + buf[3] = (note_id & 0x000007f0) >> 4; + buf[4] = (note_id & 0x0000000f); +} + +static event_id_t +unmidify_note_id (uint8_t* buf) +{ + return ((int) buf[0] << 25) | ((int) buf[1] << 18) | ((int) buf[2] << 11) | ((int)buf[3] << 4) | (int) buf[4]; +} + /** Read an event from the current position in file. * * File position MUST be at the beginning of a delta time, or this will die very messily. @@ -195,24 +211,37 @@ SMF::seek_to_start() const * \a size must be the capacity of \a buf. If it is not large enough, \a buf will * be reallocated and *size will be set to the new size of buf. * + * if the event is a meta-event and is an Evoral Note ID, then \a note_id will be set + * to the value of the NoteID; otherwise, meta-events will set \a note_id to -1. + * * \return event length (including status byte) on success, 0 if event was - * skipped (e.g. a meta event), or -1 on EOF (or end of track). + * a meta event, or -1 on EOF (or end of track). */ int -SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const +SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf, event_id_t* note_id) const { smf_event_t* event; assert(delta_t); assert(size); assert(buf); + assert(note_id); if ((event = smf_track_get_next_event(_smf_track)) != NULL) { *delta_t = event->delta_time_pulses; if (smf_event_is_metadata(event)) { - return 0; + *note_id = -1; // "no note id in this meta-event */ + if (event->midi_buffer[1] == 0x99) { // Evoral meta-event + if (event->midi_buffer[2] == 6) { // 6 bytes following + if (event->midi_buffer[3] == 0x1) { // Evoral Note ID + *note_id = unmidify_note_id (&event->midi_buffer[4]); + cerr << "Loaded Event ID " << *note_id << endl; + } + } + } + return 0; /* this is a meta-event */ } int event_size = event->midi_buffer_length; @@ -239,7 +268,7 @@ SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const } void -SMF::append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf) +SMF::append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf, event_id_t note_id) { if (size == 0) { return; @@ -257,6 +286,26 @@ SMF::append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf) smf_event_t* event; + /* XXX july 2010: currently only store event ID's for notes + */ + + if (((buf[0] & 0xf0) == MIDI_CMD_NOTE_ON || ((buf[0] & 0xf0) == MIDI_CMD_NOTE_OFF)) && note_id >= 0) { + event = smf_event_new (); + assert(event != NULL); + + event->midi_buffer = new uint8_t[9]; + event->midi_buffer_length = 9; + + event->midi_buffer[0] = 0xff; // Meta-event + event->midi_buffer[1] = 0x99; // Evoral meta-event + event->midi_buffer[2] = 6; // 6 bytes of data follow */ + event->midi_buffer[3] = 0x1; // Evoral Note ID + midify_note_id (note_id, &event->midi_buffer[4]); + + assert(_smf_track); + smf_track_add_event_delta_pulses(_smf_track, event, 0); + } + event = smf_event_new_from_pointer(buf, size); assert(event != NULL); diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index a9d55056bd..7a5160c352 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -165,8 +165,7 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t switch (_type) { case NOTE_ON: DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at note on event @ %1\n", earliest_t)); - _event = boost::shared_ptr< Event<Time> >( - new Event<Time>((*_note_iter)->on_event(), true)); + _event = boost::shared_ptr<Event<Time> > (new Event<Time> ((*_note_iter)->on_event(), true)); _active_notes.push(*_note_iter); break; case SYSEX: @@ -603,7 +602,9 @@ Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg) return false; } - _edited = true; + if (note->id() < 0) { + note->set_id (Evoral::next_event_id()); + } if (note->note() < _lowest_note) _lowest_note = note->note(); @@ -612,8 +613,10 @@ Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg) _notes.insert (note); _pitches[note->channel()].insert (note); + + _edited = true; - return true; + return true; } template<typename Time> @@ -676,10 +679,9 @@ Sequence<Time>::remove_note_unlocked(const constNotePtr note) */ template<typename Time> void -Sequence<Time>::append(const Event<Time>& event) +Sequence<Time>::append(const Event<Time>& event, event_id_t evid) { WriteLock lock(write_lock()); - _edited = true; const MIDIEvent<Time>& ev = (const MIDIEvent<Time>&)event; @@ -691,224 +693,237 @@ Sequence<Time>::append(const Event<Time>& event) return; } + if (ev.is_note_on()) { NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity())); - append_note_on_unlocked (note); + append_note_on_unlocked (note, evid); } else if (ev.is_note_off()) { NotePtr note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity())); + /* XXX note: event ID is discarded because we merge the on+off events into + a single note object + */ append_note_off_unlocked (note); } else if (ev.is_sysex()) { - append_sysex_unlocked(ev); - } else if (!_type_map.type_is_midi(ev.event_type())) { - printf("WARNING: Sequence: Unknown event type %X: ", ev.event_type()); - for (size_t i=0; i < ev.size(); ++i) { - printf("%X ", ev.buffer()[i]); - } - printf("\n"); + append_sysex_unlocked(ev, evid); } else if (ev.is_cc()) { append_control_unlocked( Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()), - ev.time(), ev.cc_value()); + ev.time(), ev.cc_value(), evid); } else if (ev.is_pgm_change()) { append_control_unlocked( Evoral::MIDI::ProgramChange(ev.event_type(), ev.channel()), - ev.time(), ev.pgm_number()); + ev.time(), ev.pgm_number(), evid); } else if (ev.is_pitch_bender()) { append_control_unlocked( Evoral::MIDI::PitchBender(ev.event_type(), ev.channel()), - ev.time(), double( (0x7F & ev.pitch_bender_msb()) << 7 - | (0x7F & ev.pitch_bender_lsb()) )); + ev.time(), double ((0x7F & ev.pitch_bender_msb()) << 7 + | (0x7F & ev.pitch_bender_lsb())), + evid); } else if (ev.is_channel_pressure()) { append_control_unlocked( Evoral::MIDI::ChannelPressure(ev.event_type(), ev.channel()), - ev.time(), ev.channel_pressure()); + ev.time(), ev.channel_pressure(), evid); + } else if (!_type_map.type_is_midi(ev.event_type())) { + printf("WARNING: Sequence: Unknown event type %X: ", ev.event_type()); + for (size_t i=0; i < ev.size(); ++i) { + printf("%X ", ev.buffer()[i]); + } + printf("\n"); } else { printf("WARNING: Sequence: Unknown MIDI event type %X\n", ev.type()); } + + _edited = true; } template<typename Time> - void - Sequence<Time>::append_note_on_unlocked (NotePtr note) - { - DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 on @ %4 v=%5\n", this, - (int) note->channel(), (int) note->note(), - note->time(), (int) note->velocity())); - assert(note->note() <= 127); - assert(note->channel() < 16); - assert(_writing); - - if (note->velocity() == 0) { - append_note_off_unlocked (note); - return; - } - - add_note_unlocked (note); - - if (!_percussive) { - DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sustained: Appending active note on %1 channel %2\n", - (unsigned)(uint8_t)note->note(), note->channel())); - _write_notes[note->channel()].insert (note); - } else { - DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n"); - } - } - - template<typename Time> - void - Sequence<Time>::append_note_off_unlocked (NotePtr note) - { - DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 on @ %4 v=%5\n", - this, (int)note->channel(), - (int)note->note(), note->time(), (int)note->velocity())); - assert(note->note() <= 127); - assert(note->channel() < 16); - assert(_writing); - _edited = true; - - if (_percussive) { - DEBUG_TRACE(DEBUG::Sequence, "Sequence Ignoring note off (percussive mode)\n"); - return; - } - - bool resolved = false; - - /* _write_notes is sorted earliest-latest, so this will find the first matching note (FIFO) that - matches this note (by pitch & channel). the MIDI specification doesn't provide any guidance - whether to use FIFO or LIFO for this matching process, so SMF is fundamentally a lossy - format. - */ +void +Sequence<Time>::append_note_on_unlocked (NotePtr note, event_id_t evid) +{ + DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 on @ %4 v=%5\n", this, + (int) note->channel(), (int) note->note(), + note->time(), (int) note->velocity())); + assert(note->note() <= 127); + assert(note->channel() < 16); + assert(_writing); + + if (note->id() < 0) { + note->set_id (evid); + } + + if (note->velocity() == 0) { + append_note_off_unlocked (note); + return; + } + + add_note_unlocked (note); + + if (!_percussive) { + DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sustained: Appending active note on %1 channel %2\n", + (unsigned)(uint8_t)note->note(), note->channel())); + _write_notes[note->channel()].insert (note); + } else { + DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n"); + } +} + +template<typename Time> +void +Sequence<Time>::append_note_off_unlocked (NotePtr note) +{ + DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 on @ %4 v=%5\n", + this, (int)note->channel(), + (int)note->note(), note->time(), (int)note->velocity())); + assert(note->note() <= 127); + assert(note->channel() < 16); + assert(_writing); + _edited = true; + + if (_percussive) { + DEBUG_TRACE(DEBUG::Sequence, "Sequence Ignoring note off (percussive mode)\n"); + return; + } + + bool resolved = false; + + /* _write_notes is sorted earliest-latest, so this will find the first matching note (FIFO) that + matches this note (by pitch & channel). the MIDI specification doesn't provide any guidance + whether to use FIFO or LIFO for this matching process, so SMF is fundamentally a lossy + format. + */ + + /* XXX use _overlap_pitch_resolution to determine FIFO/LIFO ... */ + + for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ++n) { + NotePtr nn = *n; + if (note->note() == nn->note() && nn->channel() == note->channel()) { + assert(note->time() >= nn->time()); + + nn->set_length (note->time() - nn->time()); + nn->set_off_velocity (note->velocity()); + + _write_notes[note->channel()].erase(n); + DEBUG_TRACE (DEBUG::Sequence, string_compose ("resolved note, length: %1\n", note->length())); + resolved = true; + break; + } + } - /* XXX use _overlap_pitch_resolution to determine FIFO/LIFO ... */ - - for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ++n) { - NotePtr nn = *n; - if (note->note() == nn->note() && nn->channel() == note->channel()) { - assert(note->time() >= nn->time()); - - nn->set_length (note->time() - nn->time()); - nn->set_off_velocity (note->velocity()); - - _write_notes[note->channel()].erase(n); - DEBUG_TRACE (DEBUG::Sequence, string_compose ("resolved note, length: %1\n", note->length())); - resolved = true; - break; - } - } - - if (!resolved) { - cerr << this << " spurious note off chan " << (int)note->channel() - << ", note " << (int)note->note() << " @ " << note->time() << endl; - } - } - - template<typename Time> - void - Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value) - { - DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 %2 @ %3\t=\t%4 # controls: %5\n", - this, _type_map.to_symbol(param), time, value, _controls.size())); - boost::shared_ptr<Control> c = control(param, true); - c->list()->rt_add(time, value); - } - - template<typename Time> - void - Sequence<Time>::append_sysex_unlocked(const MIDIEvent<Time>& ev) - { - #ifdef DEBUG_SEQUENCE - cerr << this << " SysEx @ " << ev.time() << " \t= \t [ " << hex; - for (size_t i=0; i < ev.size(); ++i) { - cerr << int(ev.buffer()[i]) << " "; - } cerr << "]" << endl; - #endif - - boost::shared_ptr<MIDIEvent<Time> > event(new MIDIEvent<Time>(ev, true)); - _sysexes.push_back(event); - } - - template<typename Time> - bool - Sequence<Time>::contains (const NotePtr& note) const - { - return contains_unlocked (note); - } - - template<typename Time> - bool - Sequence<Time>::contains_unlocked (const NotePtr& note) const - { - const Pitches& p (pitches (note->channel())); - NotePtr search_note(new Note<Time>(0, 0, 0, note->note())); - - for (typename Pitches::const_iterator i = p.lower_bound (search_note); - i != p.end() && (*i)->note() == note->note(); ++i) { - - if (**i == *note) { - cerr << "Existing note matches: " << *i << endl; - return true; - } - } - - return false; - } - - template<typename Time> - bool - Sequence<Time>::overlaps (const NotePtr& note, const NotePtr& without) const - { - ReadLock lock (read_lock()); - return overlaps_unlocked (note, without); - } - - template<typename Time> - bool - Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without) const - { - Time sa = note->time(); - Time ea = note->end_time(); + if (!resolved) { + cerr << this << " spurious note off chan " << (int)note->channel() + << ", note " << (int)note->note() << " @ " << note->time() << endl; + } +} + +template<typename Time> +void +Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value, event_id_t evid) +{ + DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 %2 @ %3\t=\t%4 # controls: %5\n", + this, _type_map.to_symbol(param), time, value, _controls.size())); + boost::shared_ptr<Control> c = control(param, true); + c->list()->rt_add(time, value); + /* XXX control events should use IDs */ +} + +template<typename Time> +void +Sequence<Time>::append_sysex_unlocked(const MIDIEvent<Time>& ev, event_id_t evid) +{ +#ifdef DEBUG_SEQUENCE + cerr << this << " SysEx @ " << ev.time() << " \t= \t [ " << hex; + for (size_t i=0; i < ev.size(); ++i) { + cerr << int(ev.buffer()[i]) << " "; + } cerr << "]" << endl; +#endif + + boost::shared_ptr<MIDIEvent<Time> > event(new MIDIEvent<Time>(ev, true)); + /* XXX sysex events should use IDs */ + _sysexes.push_back(event); +} + +template<typename Time> +bool +Sequence<Time>::contains (const NotePtr& note) const +{ + ReadLock lock (read_lock()); + return contains_unlocked (note); +} + +template<typename Time> +bool +Sequence<Time>::contains_unlocked (const NotePtr& note) const +{ + const Pitches& p (pitches (note->channel())); + NotePtr search_note(new Note<Time>(0, 0, 0, note->note())); + + for (typename Pitches::const_iterator i = p.lower_bound (search_note); + i != p.end() && (*i)->note() == note->note(); ++i) { + + if (**i == *note) { + return true; + } + } + + return false; +} + +template<typename Time> +bool +Sequence<Time>::overlaps (const NotePtr& note, const NotePtr& without) const +{ + ReadLock lock (read_lock()); + return overlaps_unlocked (note, without); +} + +template<typename Time> +bool +Sequence<Time>::overlaps_unlocked (const NotePtr& note, const NotePtr& without) const +{ + Time sa = note->time(); + Time ea = note->end_time(); - const Pitches& p (pitches (note->channel())); - NotePtr search_note(new Note<Time>(0, 0, 0, note->note())); - - for (typename Pitches::const_iterator i = p.lower_bound (search_note); - i != p.end() && (*i)->note() == note->note(); ++i) { - - if (without && (**i) == *without) { - continue; - } - - Time sb = (*i)->time(); - Time eb = (*i)->end_time(); - - if (((sb > sa) && (eb <= ea)) || - ((eb >= sa) && (eb <= ea)) || - ((sb > sa) && (sb <= ea)) || - ((sa >= sb) && (sa <= eb) && (ea <= eb))) { - return true; - } - } - - return false; - } - - template<typename Time> - void - Sequence<Time>::set_notes (const Sequence<Time>::Notes& n) - { - _notes = n; - } - - /** Return the earliest note with time >= t */ - template<typename Time> - typename Sequence<Time>::Notes::const_iterator - Sequence<Time>::note_lower_bound (Time t) const - { - NotePtr search_note(new Note<Time>(0, t, 0, 0, 0)); - typename Sequence<Time>::Notes::const_iterator i = _notes.lower_bound(search_note); - assert(i == _notes.end() || (*i)->time() >= t); - return i; - } + const Pitches& p (pitches (note->channel())); + NotePtr search_note(new Note<Time>(0, 0, 0, note->note())); + + for (typename Pitches::const_iterator i = p.lower_bound (search_note); + i != p.end() && (*i)->note() == note->note(); ++i) { + + if (without && (**i) == *without) { + continue; + } + + Time sb = (*i)->time(); + Time eb = (*i)->end_time(); + + if (((sb > sa) && (eb <= ea)) || + ((eb >= sa) && (eb <= ea)) || + ((sb > sa) && (sb <= ea)) || + ((sa >= sb) && (sa <= eb) && (ea <= eb))) { + return true; + } + } + + return false; +} + +template<typename Time> +void +Sequence<Time>::set_notes (const Sequence<Time>::Notes& n) +{ + _notes = n; +} + +/** Return the earliest note with time >= t */ +template<typename Time> +typename Sequence<Time>::Notes::const_iterator +Sequence<Time>::note_lower_bound (Time t) const +{ + NotePtr search_note(new Note<Time>(0, t, 0, 0, 0)); + typename Sequence<Time>::Notes::const_iterator i = _notes.lower_bound(search_note); + assert(i == _notes.end() || (*i)->time() >= t); + return i; +} template<typename Time> void |