Fix my name :)
[ardour.git] / libs / evoral / src / Sequence.cpp
index 523643665fb49d176abbe273042274f143964ae9..d7ae73c0569e976b6dff9137d0bbe0ed9c53b82b 100644 (file)
@@ -1,5 +1,5 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
  *
  * Evoral is free software; you can redistribute it and/or modify it under the
@@ -16,7 +16,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define __STDC_LIMIT_MACROS 1
 #include <algorithm>
 #include <cmath>
 #include <iostream>
@@ -24,6 +23,9 @@
 #include <stdexcept>
 #include <stdint.h>
 #include <cstdio>
+
+#include "pbd/compose.h"
+
 #include "evoral/Control.hpp"
 #include "evoral/ControlList.hpp"
 #include "evoral/ControlSet.hpp"
 #include "evoral/TypeMap.hpp"
 #include "evoral/midi_util.h"
 
-// #define DEBUG_SEQUENCE 1
-#ifdef DEBUG_SEQUENCE
-       #include <boost/format.hpp>
-       using boost::format;
-       #define DUMP(x) cerr << (x);
-#else
-       #define DUMP(x)
-#endif
-
 using namespace std;
+using namespace PBD;
+
+/** Minimum time between MIDI outputs from a single interpolated controller,
+    expressed in beats.  This is to limit the rate at which MIDI messages
+    are generated.  It is only applied to interpolated controllers.
+
+    XXX: This is a hack.  The time should probably be expressed in
+    seconds rather than beats, and should be configurable etc. etc.
+*/
+static double const time_between_interpolated_controller_outputs = 1.0 / 256;
 
 namespace Evoral {
 
@@ -57,16 +60,20 @@ Sequence<Time>::const_iterator::const_iterator()
        _event = boost::shared_ptr< Event<Time> >(new Event<Time>());
 }
 
+/** @param force_discrete true to force ControlLists to use discrete evaluation, otherwise false to get them to use their configured mode */
 template<typename Time>
-Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t)
+Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t, bool force_discrete, std::set<Evoral::Parameter> const & filtered)
        : _seq(&seq)
+       , _active_patch_change_message (0)
        , _type(NIL)
        , _is_end((t == DBL_MAX) || seq.empty())
        , _note_iter(seq.notes().end())
        , _sysex_iter(seq.sysexes().end())
+       , _patch_change_iter(seq.patch_changes().end())
        , _control_iter(_control_iters.end())
+       , _force_discrete (force_discrete)
 {
-       DUMP(format("Created Iterator @ %1% (is end: %2%)\n)") % t % _is_end);
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Created Iterator @ %1 (is end: %2)\n)", t, _is_end));
 
        if (!_is_end) {
                _lock = seq.read_lock();
@@ -89,18 +96,38 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
        }
        assert(_sysex_iter == seq.sysexes().end() || (*_sysex_iter)->time() >= t);
 
+       // Find first patch event at or after t
+       for (typename Sequence<Time>::PatchChanges::const_iterator i = seq.patch_changes().begin(); i != seq.patch_changes().end(); ++i) {
+               if ((*i)->time() >= t) {
+                       _patch_change_iter = i;
+                       break;
+               }
+       }
+       assert (_patch_change_iter == seq.patch_changes().end() || (*_patch_change_iter)->time() >= t);
+
        // Find first control event after t
        ControlIterator earliest_control(boost::shared_ptr<ControlList>(), DBL_MAX, 0.0);
        _control_iters.reserve(seq._controls.size());
        bool   found                  = false;
        size_t earliest_control_index = 0;
        for (Controls::const_iterator i = seq._controls.begin(); i != seq._controls.end(); ++i) {
-               DUMP(format("Iterator: control: %1%\n") % seq._type_map.to_symbol(i->first));
+
+               if (filtered.find (i->first) != filtered.end()) {
+                       /* this parameter is filtered, so don't bother setting up an iterator for it */
+                       continue;
+               }
+               
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: control: %1\n", seq._type_map.to_symbol(i->first)));
                double x, y;
-               bool ret = i->second->list()->rt_safe_earliest_event_unlocked(t, DBL_MAX, x, y, true);
+               bool ret;
+               if (_force_discrete) {
+                       ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t, x, y, true);
+               } else {
+                       ret = i->second->list()->rt_safe_earliest_event_unlocked(t, x, y, true);
+               }
                if (!ret) {
-                       DUMP(format("Iterator: CC %1% (size %2%) has no events past %3%\n")
-                                       % i->first.id() % i->second->list()->size() % t);
+                       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 (size %2) has no events past %3\n",
+                                                                      i->first.id(), i->second->list()->size(), t));
                        continue;
                }
 
@@ -113,7 +140,7 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
                        continue;
                }
 
-               DUMP(format("Iterator: CC %1% added (%2%, %3%)\n") % i->first.id() % x % y);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 added (%2, %3)\n", i->first.id(), x, y));
 
                const ControlIterator new_iter(i->second->list(), x, y);
                _control_iters.push_back(new_iter);
@@ -147,6 +174,11 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
                earliest_t = (*_sysex_iter)->time();
        }
 
+       if (_patch_change_iter != seq.patch_changes().end() && ((*_patch_change_iter)->time() < earliest_t || _type == NIL)) {
+               _type = PATCH_CHANGE;
+               earliest_t = (*_patch_change_iter)->time ();
+       }
+
        if (_control_iter != _control_iters.end()
                        && earliest_control.list && earliest_control.x >= t
                        && (earliest_control.x < earliest_t || _type == NIL)) {
@@ -156,35 +188,40 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
 
        switch (_type) {
        case NOTE_ON:
-               DUMP(format("Starting at note on event @ %1%\n") % earliest_t);
-               _event = boost::shared_ptr< Event<Time> >(
-                               new Event<Time>((*_note_iter)->on_event(), true));
+               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));
                _active_notes.push(*_note_iter);
                break;
        case SYSEX:
-               DUMP(format("Starting at sysex event @ %1%\n") % earliest_t);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at sysex event @ %1\n", earliest_t));
                _event = boost::shared_ptr< Event<Time> >(
                                new Event<Time>(*(*_sysex_iter), true));
                break;
        case CONTROL:
-               DUMP(format("Starting at control event @ %1%\n") % earliest_t);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at control event @ %1\n", earliest_t));
                seq.control_to_midi_event(_event, earliest_control);
                break;
+       case PATCH_CHANGE:
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at patch change event @ %1\n", earliest_t));
+               _event = boost::shared_ptr<Event<Time> > (new Event<Time> ((*_patch_change_iter)->message (_active_patch_change_message), true));
+               break;
        default:
                break;
        }
 
        if (_type == NIL || !_event || _event->size() == 0) {
-               DUMP(format("Starting at end @ %1%\n") % t);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at end @ %1\n", t));
                _type   = NIL;
                _is_end = true;
        } else {
-               DUMP(printf("New iterator = 0x%x : 0x%x @ %f\n",
-                           (int)_event->event_type(),
-                           (int)((MIDIEvent<Time>*)_event.get())->type(),
-                           _event->time()));
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("New iterator = 0x%1 : 0x%2 @ %3\n",
+                                                              (int)_event->event_type(),
+                                                              (int)((MIDIEvent<Time>*)_event.get())->type(),
+                                                              _event->time()));
+               
                assert(midi_event_is_valid(_event->buffer(), _event->size()));
        }
+
 }
 
 template<typename Time>
@@ -204,6 +241,8 @@ Sequence<Time>::const_iterator::invalidate()
        if (_seq) {
                _note_iter = _seq->notes().end();
                _sysex_iter = _seq->sysexes().end();
+               _patch_change_iter = _seq->patch_changes().end();
+               _active_patch_change_message = 0;
        }
        _control_iter = _control_iters.end();
        _lock.reset();
@@ -217,7 +256,7 @@ Sequence<Time>::const_iterator::operator++()
                throw std::logic_error("Attempt to iterate past end of Sequence");
        }
 
-       DUMP("Sequence::const_iterator++\n");
+       DEBUG_TRACE(DEBUG::Sequence, "Sequence::const_iterator++\n");
        assert(_event && _event->buffer() && _event->size() > 0);
 
        const MIDIEvent<Time>& ev = *((MIDIEvent<Time>*)_event.get());
@@ -245,8 +284,15 @@ Sequence<Time>::const_iterator::operator++()
                break;
        case CONTROL:
                // Increment current controller iterator
-               ret = _control_iter->list->rt_safe_earliest_event_unlocked(
-                               _control_iter->x, DBL_MAX, x, y, false);
+               if (_force_discrete || _control_iter->list->interpolation() == ControlList::Discrete) {
+                       ret = _control_iter->list->rt_safe_earliest_event_discrete_unlocked (
+                               _control_iter->x, x, y, false
+                               );
+               } else {
+                       ret = _control_iter->list->rt_safe_earliest_event_linear_unlocked (
+                               _control_iter->x + time_between_interpolated_controller_outputs, x, y, false
+                               );
+               }
                assert(!ret || x > _control_iter->x);
                if (ret) {
                        _control_iter->x = x;
@@ -269,6 +315,13 @@ Sequence<Time>::const_iterator::operator++()
        case SYSEX:
                ++_sysex_iter;
                break;
+       case PATCH_CHANGE:
+               ++_active_patch_change_message;
+               if (_active_patch_change_message == (*_patch_change_iter)->messages()) {
+                       ++_patch_change_iter;
+                       _active_patch_change_message = 0;
+               }
+               break;
        default:
                assert(false);
        }
@@ -307,29 +360,41 @@ Sequence<Time>::const_iterator::operator++()
                }
        }
 
+       // Use the next earliest patch change iff it's earlier than the SysEx
+       if (_patch_change_iter != _seq->patch_changes().end()) {
+               if (_type == NIL || (*_patch_change_iter)->time() < earliest_t) {
+                       _type = PATCH_CHANGE;
+                       earliest_t = (*_patch_change_iter)->time();
+               }
+       }
+
        // Set event to reflect new position
        switch (_type) {
        case NOTE_ON:
-               DUMP("iterator = note on\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = note on\n");
                *_event = (*_note_iter)->on_event();
                _active_notes.push(*_note_iter);
                break;
        case NOTE_OFF:
-               DUMP("iterator = note off\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = note off\n");
                assert(!_active_notes.empty());
                *_event = _active_notes.top()->off_event();
                _active_notes.pop();
                break;
        case CONTROL:
-               DUMP("iterator = control\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = control\n");
                _seq->control_to_midi_event(_event, *_control_iter);
                break;
        case SYSEX:
-               DUMP("iterator = sysex\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = sysex\n");
                *_event = *(*_sysex_iter);
                break;
+       case PATCH_CHANGE:
+               DEBUG_TRACE(DEBUG::Sequence, "iterator = patch change\n");
+               *_event = (*_patch_change_iter)->message (_active_patch_change_message);
+               break;
        default:
-               DUMP("iterator = end\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
                _is_end = true;
        }
 
@@ -364,7 +429,10 @@ Sequence<Time>::const_iterator::operator=(const const_iterator& other)
        _is_end        = other._is_end;
        _note_iter     = other._note_iter;
        _sysex_iter    = other._sysex_iter;
+       _patch_change_iter = other._patch_change_iter;
        _control_iters = other._control_iters;
+       _force_discrete = other._force_discrete;
+       _active_patch_change_message = other._active_patch_change_message;
 
        if (other._lock)
                _lock = _seq->read_lock();
@@ -386,31 +454,39 @@ Sequence<Time>::const_iterator::operator=(const const_iterator& other)
 template<typename Time>
 Sequence<Time>::Sequence(const TypeMap& type_map)
        : _edited(false)
-       , _type_map(type_map)
+        , _overlapping_pitches_accepted (true)
+        , _overlap_pitch_resolution (FirstOnFirstOff)
        , _writing(false)
-       , _end_iter(*this, DBL_MAX)
+       , _type_map(type_map)
+       , _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
        , _percussive(false)
        , _lowest_note(127)
        , _highest_note(0)
 {
-       DUMP(format("Sequence constructed: %1%\n") % this);
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence constructed: %1\n", this));
        assert(_end_iter._is_end);
        assert( ! _end_iter._lock);
+
+       for (int i = 0; i < 16; ++i) {
+               _bank[i] = 0;
+       }
 }
 
 template<typename Time>
 Sequence<Time>::Sequence(const Sequence<Time>& other)
        : ControlSet (other)
         , _edited(false)
-       , _type_map(other._type_map)
+        , _overlapping_pitches_accepted (other._overlapping_pitches_accepted)
+        , _overlap_pitch_resolution (other._overlap_pitch_resolution)
        , _writing(false)
-       , _end_iter(*this, DBL_MAX)
+       , _type_map(other._type_map)
+       , _end_iter(*this, DBL_MAX, false, std::set<Evoral::Parameter> ())
        , _percussive(other._percussive)
        , _lowest_note(other._lowest_note)
        , _highest_note(other._highest_note)
 {
         for (typename Notes::const_iterator i = other._notes.begin(); i != other._notes.end(); ++i) {
-                boost::shared_ptr<Note<Time> > n (new Note<Time> (**i));
+                NotePtr n (new Note<Time> (**i));
                 _notes.insert (n);
         }
 
@@ -419,7 +495,16 @@ Sequence<Time>::Sequence(const Sequence<Time>& other)
                 _sysexes.push_back (n);
         }
 
-       DUMP(format("Sequence copied: %1%\n") % this);
+       for (typename PatchChanges::const_iterator i = other._patch_changes.begin(); i != other._patch_changes.end(); ++i) {
+               PatchChangePtr n (new PatchChange<Time> (**i));
+               _patch_changes.insert (n);
+       }
+
+       for (int i = 0; i < 16; ++i) {
+               _bank[i] = other._bank[i];
+       }
+
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence copied: %1\n", this));
        assert(_end_iter._is_end);
        assert(! _end_iter._lock);
 }
@@ -523,13 +608,12 @@ template<typename Time>
 void
 Sequence<Time>::start_write()
 {
-       DUMP(format("%1% : start_write (percussive = %2%)\n") % this % _percussive);
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 : start_write (percussive = %2)\n", this, _percussive));
        WriteLock lock(write_lock());
        _writing = true;
        for (int i = 0; i < 16; ++i) {
                _write_notes[i].clear();
        }
-       _dirty_controls.clear();
 }
 
 /** Finish a write of events to the model.
@@ -540,7 +624,7 @@ Sequence<Time>::start_write()
  */
 template<typename Time>
 void
-Sequence<Time>::end_write(bool delete_stuck)
+Sequence<Time>::end_write (bool delete_stuck)
 {
        WriteLock lock(write_lock());
 
@@ -548,19 +632,21 @@ Sequence<Time>::end_write(bool delete_stuck)
                return;
        }
 
-       DUMP(format("%1% : end_write (%2% notes)\n") % this % _notes.size());
-
-       if (!_percussive && delete_stuck) {
-               for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
-                       typename Notes::iterator next = n;
-                       ++next;
-                       if ((*n)->length() == 0) {
-                               cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
-                               _notes.erase(n);
-                       }
-                       n = next;
-               }
-       }
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 : end_write (%2 notes)\n", this, _notes.size()));
+
+        if (!_percussive && delete_stuck) {
+                for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
+                        typename Notes::iterator next = n;
+                        ++next;
+                       
+                        if ((*n)->length() == 0) {
+                                cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
+                                _notes.erase(n);
+                        }
+                        
+                        n = next;
+                }
+        }
 
        for (int i = 0; i < 16; ++i) {
                if (!_write_notes[i].empty()) {
@@ -570,220 +656,400 @@ Sequence<Time>::end_write(bool delete_stuck)
                _write_notes[i].clear();
        }
 
-       for (ControlLists::const_iterator i = _dirty_controls.begin(); i != _dirty_controls.end(); ++i) {
-               (*i)->mark_dirty();
+       _writing = false;
+}
+
+
+template<typename Time>
+bool
+Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg)
+{
+        /* This is the core method to add notes to a Sequence 
+         */
+
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 add note %2 @ %3\n", this, (int)note->note(), note->time()));
+
+        if (resolve_overlaps_unlocked (note, arg)) {
+                DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 DISALLOWED: note %2 @ %3\n", this, (int)note->note(), note->time()));
+                return false;
        }
 
-       _writing = false;
+        if (note->id() < 0) {
+                note->set_id (Evoral::next_event_id());
+        } 
+
+       if (note->note() < _lowest_note)
+               _lowest_note = note->note();
+       if (note->note() > _highest_note)
+               _highest_note = note->note();
+
+       _notes.insert (note);
+        _pitches[note->channel()].insert (note);
+       _edited = true;
+
+       return true;
 }
 
-/** Append \a ev to model.  NOT realtime safe.
- *
- * Timestamps of events in \a buf are expected to be relative to
- * the start of this model (t=0) and MUST be monotonically increasing
- * and MUST be >= the latest event currently in the model.
- */
 template<typename Time>
 void
-Sequence<Time>::append(const Event<Time>& event)
+Sequence<Time>::remove_note_unlocked(const constNotePtr note)
 {
-       WriteLock lock(write_lock());
+        bool erased = false;
+
        _edited = true;
 
-       const MIDIEvent<Time>& ev = (const MIDIEvent<Time>&)event;
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note %2 @ %3\n", this, (int)note->note(), note->time()));
 
-       assert(_notes.empty() || ev.time() >= (*_notes.rbegin())->time());
-       assert(_writing);
+       typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
+       while (i != _notes.end() && (*i)->time() == note->time()) {
 
-       if (!midi_event_is_valid(ev.buffer(), ev.size())) {
-               cerr << "WARNING: Sequence ignoring illegal MIDI event" << endl;
-               return;
+               typename Sequence<Time>::Notes::iterator tmp = i;
+               ++tmp;
+
+               if (*i == note) {
+
+                       NotePtr n = *i;
+                        
+                        DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
+                       _notes.erase (i);
+
+                        if (n->note() == _lowest_note || n->note() == _highest_note) {
+
+                                _lowest_note = 127;
+                                _highest_note = 0;
+
+                                for (typename Sequence<Time>::Notes::iterator ii = _notes.begin(); ii != _notes.end(); ++ii) {
+                                        if ((*ii)->note() < _lowest_note)
+                                                _lowest_note = (*ii)->note();
+                                        if ((*ii)->note() > _highest_note)
+                                                _highest_note = (*ii)->note();
+                                }
+                        }
+                        
+                        erased = true;
+                }
+
+               i = tmp;
        }
 
-       if (ev.is_note_on()) {
-               append_note_on_unlocked(ev.channel(), ev.time(), ev.note(), ev.velocity());
-       } else if (ev.is_note_off()) {
-               append_note_off_unlocked(ev.channel(), ev.time(), ev.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");
-       } else if (ev.is_cc()) {
-               append_control_unlocked(
-                               Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()),
-                               ev.time(), ev.cc_value());
-       } else if (ev.is_pgm_change()) {
-               append_control_unlocked(
-                               Evoral::MIDI::ProgramChange(ev.event_type(), ev.channel()),
-                               ev.time(), ev.pgm_number());
-       } 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()) ));
-       } else if (ev.is_channel_pressure()) {
-               append_control_unlocked(
-                               Evoral::MIDI::ChannelPressure(ev.event_type(), ev.channel()),
-                               ev.time(), ev.channel_pressure());
-       } else {
-               printf("WARNING: Sequence: Unknown MIDI event type %X\n", ev.type());
+        Pitches& p (pitches (note->channel()));
+        
+        NotePtr search_note(new Note<Time>(0, 0, 0, note->note(), 0));
+
+        typename Pitches::iterator j = p.lower_bound (search_note);
+       while (j != p.end() && (*j)->note() == note->note()) {
+               typename Pitches::iterator tmp = j;
+               ++tmp;
+               
+                if (*j == note) {
+                        DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*j)->note(), (*j)->time()));
+                        p.erase (j);
+                }
+
+               j = tmp;
+        }
+        
+        if (!erased) {
+                cerr << "Unable to find note to erase" << endl;
+        }
+}
+
+template<typename Time>
+void
+Sequence<Time>::add_patch_change_unlocked (PatchChangePtr p)
+{
+       _patch_changes.insert (p);
+       if (p->id () < 0) {
+               p->set_id (Evoral::next_event_id ());
        }
 }
 
 template<typename Time>
 void
-Sequence<Time>::append_note_on_unlocked(uint8_t chan, Time time, uint8_t note_num, uint8_t velocity)
+Sequence<Time>::remove_patch_change_unlocked (const constPatchChangePtr p)
 {
-       DUMP(format("%1% c=%2% note %3% on @ %4% v=%5%\n")
-                       % this % (int)chan % (int)note_num % time % (int)velocity);
-       assert(note_num <= 127);
-       assert(chan < 16);
-       assert(_writing);
-       _edited = true;
+       typename Sequence<Time>::PatchChanges::iterator i = patch_change_lower_bound (p->time ());
+       while (i != _patch_changes.end() && (*i)->time() == p->time()) {
 
-       if (velocity == 0) {
-               append_note_off_unlocked(chan, time, note_num);
-               return;
-       }
+               typename Sequence<Time>::PatchChanges::iterator tmp = i;
+               ++tmp;
 
-       if (note_num < _lowest_note)
-               _lowest_note = note_num;
-       if (note_num > _highest_note)
-               _highest_note = note_num;
+               if (*i == p) {
+                       _patch_changes.erase (i);
+               }
 
-       boost::shared_ptr< Note<Time> > new_note(new Note<Time>(chan, time, 0, note_num, velocity));
-       _notes.insert(new_note);
-       if (!_percussive) {
-               DUMP(format("Sustained: Appending active note on %1% channel %2%\n")
-                               % (unsigned)(uint8_t)note_num % chan);
-               _write_notes[chan].insert(new_note);
-       } else {
-               DUMP("Percussive: NOT appending active note on\n");
+               i = tmp;
        }
 }
 
+/** Append \a ev to model.  NOT realtime safe.
+ *
+ * The timestamp of event is expected to be relative to
+ * the start of this model (t=0) and MUST be monotonically increasing
+ * and MUST be >= the latest event currently in the model.
+ */
 template<typename Time>
 void
-Sequence<Time>::append_note_off_unlocked(uint8_t chan, Time time, uint8_t note_num)
+Sequence<Time>::append(const Event<Time>& event, event_id_t evid)
 {
-       DUMP(format("%1% c=%2% note %3% off @ %4%\n")
-                       % this % (int)chan % (int)note_num % time);
-       assert(note_num <= 127);
-       assert(chan < 16);
-       assert(_writing);
-       _edited = true;
+        WriteLock lock(write_lock());
 
-       if (_percussive) {
-               DUMP("Sequence Ignoring note off (percussive mode)\n");
-               return;
-       }
+        const MIDIEvent<Time>& ev = (const MIDIEvent<Time>&)event;
 
-       // TODO: support note off velocity
+        assert(_notes.empty() || ev.time() >= (*_notes.rbegin())->time());
+        assert(_writing);
 
-       bool resolved = false;
-       for (typename WriteNotes::iterator n = _write_notes[chan].begin();
-                       n != _write_notes[chan].end(); ++n) {
-               boost::shared_ptr< Note<Time> > note = *n;
-               if (note->note() == note_num) {
-                       assert(time >= note->time());
-                       note->set_length(time - note->time());
-                       _write_notes[chan].erase(n);
-                       DUMP(format("resolved note, length: %1%\n") % note->length());
-                       resolved = true;
-                       break;
+        if (!midi_event_is_valid(ev.buffer(), ev.size())) {
+                cerr << "WARNING: Sequence ignoring illegal MIDI event" << endl;
+                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, 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, evid);
+       } else if (ev.is_cc() && (ev.cc_number() == MIDI_CTL_MSB_BANK || ev.cc_number() == MIDI_CTL_LSB_BANK)) {
+               /* note bank numbers in our _bank[] array, so that we can write an event when the program change arrives */
+               if (ev.cc_number() == MIDI_CTL_MSB_BANK) {
+                       _bank[ev.channel()] &= (0x7f << 7);
+                       _bank[ev.channel()] |= ev.cc_value() << 7;
+               } else {
+                       _bank[ev.channel()] &= 0x7f;
+                       _bank[ev.channel()] |= ev.cc_value();
                }
-       }
+        } else if (ev.is_cc()) {
+                append_control_unlocked(
+                        Evoral::MIDI::ContinuousController(ev.event_type(), ev.channel(), ev.cc_number()),
+                        ev.time(), ev.cc_value(), evid);
+        } else if (ev.is_pgm_change()) {
+               /* write a patch change with this program change and any previously set-up bank number */
+               append_patch_change_unlocked (PatchChange<Time> (ev.time(), ev.channel(), ev.pgm_number(), _bank[ev.channel()]), 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())),
+                        evid);
+        } else if (ev.is_channel_pressure()) {
+                append_control_unlocked(
+                        Evoral::MIDI::ChannelPressure(ev.event_type(), ev.channel()),
+                        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());
+        }
 
-       if (!resolved) {
-               cerr << this << " spurious note off chan " << (int)chan
-                               << ", note " << (int)note_num << " @ " << time << endl;
-       }
+        _edited = true;
 }
 
 template<typename Time>
 void
-Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value)
+Sequence<Time>::append_note_on_unlocked (NotePtr note, event_id_t evid)
 {
-       DUMP(format("%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);
+        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_sysex_unlocked(const MIDIEvent<Time>& ev)
+Sequence<Time>::append_note_off_unlocked (NotePtr note)
 {
-       #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
+        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 ... */
 
-       boost::shared_ptr<MIDIEvent<Time> > event(new MIDIEvent<Time>(ev, true));
-       _sysexes.push_back(event);
+        for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ) {
+
+               typename WriteNotes::iterator tmp = n;
+               ++tmp;
+               
+                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;
+                }
+
+               n = tmp;
+        }
+
+        if (!resolved) {
+                cerr << this << " spurious note off chan " << (int)note->channel()
+                     << ", note " << (int)note->note() << " @ " << note->time() << endl;
+        }
 }
 
 template<typename Time>
-bool
-Sequence<Time>::contains(const boost::shared_ptr< Note<Time> > note) const
+void
+Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value, event_id_t /* evid */)
 {
-        ReadLock lock (read_lock());
+        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()->add (time, value);
+        /* XXX control events should use IDs */
+}
 
-       for (typename Sequence<Time>::Notes::const_iterator i = note_lower_bound(note->time());
-                       i != _notes.end() && (*i)->time() == note->time(); ++i) {
-               if (*i == note) {
-                        cerr << "Existing note matches: " << *i << endl;
-                       return true;
-               }
+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>
+void
+Sequence<Time>::append_patch_change_unlocked (const PatchChange<Time>& ev, event_id_t id)
+{
+       PatchChangePtr p (new PatchChange<Time> (ev));
+       
+       if (p->id() < 0) {
+               p->set_id (id);
        }
-        cerr << "No matching note for " << note << endl;
-        return false;
+       
+       _patch_changes.insert (p);
 }
 
 template<typename Time>
 bool
-Sequence<Time>::add_note_unlocked(const boost::shared_ptr< Note<Time> > note)
+Sequence<Time>::contains (const NotePtr& note) const
 {
-       DUMP(format("%1% add note %2% @ %3%\n") % this % (int)note->note() % note->time());
+        ReadLock lock (read_lock());
+        return contains_unlocked (note);
+}
 
-       for (typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
-                       i != _notes.end() && (*i)->time() == note->time(); ++i) {
-               if (*i == note) {
-                       return false;
-               }
-       }
+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()));
 
-       _edited = true;
-       _notes.insert(note);
-        return true;
+        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>
-void
-Sequence<Time>::remove_note_unlocked(const boost::shared_ptr< const Note<Time> > note)
+bool
+Sequence<Time>::overlaps (const NotePtr& note, const NotePtr& without) const
 {
-       _edited = true;
-       DUMP(format("%1% remove note %2% @ %3%\n") % this % (int)note->note() % note->time());
-       for (typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
-                       i != _notes.end() && (*i)->time() == note->time(); ++i) {
-               if (*i == note) {
-                       _notes.erase(i);
-               }
-       }
-       cerr << "Unable to find note to erase" << endl;
+        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;
+        _notes = n;
 }
 
 /** Return the earliest note with time >= t */
@@ -791,10 +1057,160 @@ template<typename Time>
 typename Sequence<Time>::Notes::const_iterator
 Sequence<Time>::note_lower_bound (Time t) const
 {
-       boost::shared_ptr< Note<Time> > 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;
+        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;
+}
+
+/** Return the earliest patch change with time >= t */
+template<typename Time>
+typename Sequence<Time>::PatchChanges::const_iterator
+Sequence<Time>::patch_change_lower_bound (Time t) const
+{
+        PatchChangePtr search (new PatchChange<Time> (t, 0, 0, 0));
+        typename Sequence<Time>::PatchChanges::const_iterator i = _patch_changes.lower_bound (search);
+        assert (i == _patch_changes.end() || (*i)->time() >= t);
+        return i;
+}
+
+template<typename Time>
+void
+Sequence<Time>::get_notes (Notes& n, NoteOperator op, uint8_t val, int chan_mask) const
+{
+        switch (op) {
+        case PitchEqual:
+        case PitchLessThan:
+        case PitchLessThanOrEqual:
+        case PitchGreater:
+        case PitchGreaterThanOrEqual:
+                get_notes_by_pitch (n, op, val, chan_mask);
+                break;
+                
+        case VelocityEqual:
+        case VelocityLessThan:
+        case VelocityLessThanOrEqual:
+        case VelocityGreater:
+        case VelocityGreaterThanOrEqual:
+                get_notes_by_velocity (n, op, val, chan_mask);
+                break;
+        }
+}
+
+template<typename Time>
+void
+Sequence<Time>::get_notes_by_pitch (Notes& n, NoteOperator op, uint8_t val, int chan_mask) const
+{
+        for (uint8_t c = 0; c < 16; ++c) {
+
+                if (chan_mask != 0 && !((1<<c) & chan_mask)) {
+                        continue;
+                }
+
+                const Pitches& p (pitches (c));
+                NotePtr search_note(new Note<Time>(0, 0, 0, val, 0));
+                typename Pitches::const_iterator i;
+                switch (op) {
+                case PitchEqual:
+                        i = p.lower_bound (search_note);
+                        while (i != p.end() && (*i)->note() == val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchLessThan:
+                        i = p.upper_bound (search_note);
+                        while (i != p.end() && (*i)->note() < val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchLessThanOrEqual:
+                        i = p.upper_bound (search_note);
+                        while (i != p.end() && (*i)->note() <= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchGreater:
+                        i = p.lower_bound (search_note);
+                        while (i != p.end() && (*i)->note() > val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchGreaterThanOrEqual:
+                        i = p.lower_bound (search_note);
+                        while (i != p.end() && (*i)->note() >= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                        
+                default:
+                        //fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_pitch() called with illegal operator"), op)) << endmsg;
+                        abort ();
+                        /* NOTREACHED*/
+                }
+        }
+}
+
+template<typename Time>
+void
+Sequence<Time>::get_notes_by_velocity (Notes& n, NoteOperator op, uint8_t val, int chan_mask) const
+{
+        ReadLock lock (read_lock());
+        
+        for (typename Notes::const_iterator i = _notes.begin(); i != _notes.end(); ++i) {
+
+                if (chan_mask != 0 && !((1<<((*i)->channel())) & chan_mask)) {
+                        continue;
+                }
+
+                switch (op) {
+                case VelocityEqual:
+                        if ((*i)->velocity() == val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case VelocityLessThan:
+                        if ((*i)->velocity() < val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case VelocityLessThanOrEqual:
+                        if ((*i)->velocity() <= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case VelocityGreater:
+                        if ((*i)->velocity() > val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case VelocityGreaterThanOrEqual:
+                        if ((*i)->velocity() >= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                default:
+                        // fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_velocity() called with illegal operator"), op)) << endmsg;
+                        abort ();
+                        /* NOTREACHED*/
+
+                }
+        }
+}
+
+template<typename Time>
+void
+Sequence<Time>::set_overlap_pitch_resolution (OverlapPitchResolution opr)
+{
+        _overlap_pitch_resolution = opr;
+
+        /* XXX todo: clean up existing overlaps in source data? */
+}
+
+template<typename Time>
+void
+Sequence<Time>::control_list_marked_dirty ()
+{
+       set_edited (true);
 }
 
 template class Sequence<Evoral::MusicalTime>;