rationale pathways that add notes to Sequence<T> so that there is only final insertio...
[ardour.git] / libs / evoral / src / Sequence.cpp
index d11988e70c58798e6f285cc3d4de1ee85d91bca8..af7b3c033607be7ab7654b1fd6dc312066683504 100644 (file)
@@ -1,16 +1,16 @@
 /* This file is part of Evoral.
  * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #include <limits>
 #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;
 
 namespace Evoral {
 
-template<typename Time>
-void Sequence<Time>::write_lock() {
-       _lock.writer_lock();
-       _control_lock.lock();
-}
-
-template<typename Time>
-void Sequence<Time>::write_unlock() {
-       _lock.writer_unlock();
-       _control_lock.unlock();
-}
-
-template<typename Time>
-void Sequence<Time>::read_lock() const {
-       _lock.reader_lock();
-}
-
-template<typename Time>
-void Sequence<Time>::read_unlock() const {
-       _lock.reader_unlock();
-}
-
-
 // Read iterator (const_iterator)
 
 template<typename Time>
 Sequence<Time>::const_iterator::const_iterator()
        : _seq(NULL)
        , _is_end(true)
-       , _locked(false)
+       , _control_iter(_control_iters.end())
 {
        _event = boost::shared_ptr< Event<Time> >(new Event<Time>());
 }
@@ -84,29 +57,24 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
        : _seq(&seq)
        , _type(NIL)
        , _is_end((t == DBL_MAX) || seq.empty())
-       , _locked(!_is_end)
+       , _note_iter(seq.notes().end())
+       , _sysex_iter(seq.sysexes().end())
+       , _control_iter(_control_iters.end())
 {
-       DUMP(format("Created Iterator @ %1% (is end: %2%)\n)") % t % _is_end);
-       
-       if (_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();
+       } else {
                return;
        }
 
-       seq.read_lock();
+       typename Sequence<Time>::ReadLock lock(seq.read_lock());
 
-       // Find first note which begins after t
-       _note_iter = seq.notes().end();
-       for (typename Sequence<Time>::Notes::const_iterator i = seq.notes().begin();
-                       i != seq.notes().end(); ++i) {
-               if ((*i)->time() >= t) {
-                       _note_iter = i;
-                       break;
-               }
-       }
-       assert(_note_iter == seq.notes().end() || (*_note_iter)->time() >= t);
-       
-       // Find first sysex event after t
-       _sysex_iter = seq.sysexes().end();
+       // Find first note which begins at or after t
+       _note_iter = seq.note_lower_bound(t);
+
+       // Find first sysex event at or after t
        for (typename Sequence<Time>::SysExes::const_iterator i = seq.sysexes().begin();
                        i != seq.sysexes().end(); ++i) {
                if ((*i)->time() >= t) {
@@ -119,13 +87,15 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, 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));
+               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);
+               bool ret = i->second->list()->rt_safe_earliest_event_unlocked(t, DBL_MAX, 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;
                }
 
@@ -137,8 +107,8 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
                                << "], event ignored" << endl;
                        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);
@@ -146,11 +116,18 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
                // Found a new earliest_control
                if (x < earliest_control.x) {
                        earliest_control = new_iter;
-                       _control_iter = _control_iters.end();
-                       --_control_iter; // now points to the last element in _control_iters
+                       earliest_control_index = _control_iters.size() - 1;
+                       found = true;
                }
        }
-       
+
+       if (found) {
+               _control_iter = _control_iters.begin() + earliest_control_index;
+               assert(_control_iter != _control_iters.end());
+       } else {
+               _control_iter = _control_iters.end();
+       }
+
        // Now find the earliest event overall and point to it
        Time earliest_t = t;
 
@@ -158,60 +135,73 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
                _type = NOTE_ON;
                earliest_t = (*_note_iter)->time();
        }
-       
-       if (_sysex_iter != seq.sysexes().end() && (*_sysex_iter)->time() < earliest_t) {
+
+       if (_sysex_iter != seq.sysexes().end()
+                       && ((*_sysex_iter)->time() < earliest_t || _type == NIL)) {
                _type = SYSEX;
                earliest_t = (*_sysex_iter)->time();
        }
 
-       if (earliest_control.list && earliest_control.x >= t && earliest_control.x < earliest_t) {
+       if (_control_iter != _control_iters.end()
+                       && earliest_control.list && earliest_control.x >= t
+                       && (earliest_control.x < earliest_t || _type == NIL)) {
                _type = CONTROL;
                earliest_t = earliest_control.x;
        }
-       
+
        switch (_type) {
        case NOTE_ON:
-               DUMP(format("Starting at note on event @ %1%\n") % earliest_t);
+               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;
        default:
-               assert(false);
+               break;
        }
 
-       if (!_event || _event->size() == 0) {
-               DUMP(format("Starting at end @ %1%\n") % t);
+       if (_type == NIL || !_event || _event->size() == 0) {
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at end @ %1\n", t));
                _type   = NIL;
                _is_end = true;
-               _locked = false;
-               _seq->read_unlock();
        } else {
-               DUMP(format("New iterator = %1% : %2% @ %3%\n")
-                               % (int)_event->event_type()
-                               % (int)((MIDIEvent<Time>*)_event.get())->type()
-                               % _event->time());
-       }
-       
-       assert(_event && _event->size() > 0 && _event->time() >= t);
-       assert(midi_event_is_valid(_event->buffer(), _event->size()));
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("New iterator = 0x%x : 0x%x @ %f\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>
 Sequence<Time>::const_iterator::~const_iterator()
 {
-       if (_locked) {
-               _seq->read_unlock();
+}
+
+template<typename Time>
+void
+Sequence<Time>::const_iterator::invalidate()
+{
+       while (!_active_notes.empty()) {
+               _active_notes.pop();
        }
+       _type = NIL;
+       _is_end = true;
+       if (_seq) {
+               _note_iter = _seq->notes().end();
+               _sysex_iter = _seq->sysexes().end();
+       }
+       _control_iter = _control_iters.end();
+       _lock.reset();
 }
 
 template<typename Time>
@@ -221,10 +211,10 @@ Sequence<Time>::const_iterator::operator++()
        if (_is_end) {
                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());
 
        if (!(     ev.is_note()
@@ -236,11 +226,11 @@ Sequence<Time>::const_iterator::operator++()
                cerr << "WARNING: Unknown event (type " << _type << "): " << hex
                        << int(ev.buffer()[0]) << int(ev.buffer()[1]) << int(ev.buffer()[2]) << endl;
        }
-       
+
        double x   = 0.0;
        double y   = 0.0;
        bool   ret = false;
-       
+
        // Increment past current event
        switch (_type) {
        case NOTE_ON:
@@ -261,7 +251,7 @@ Sequence<Time>::const_iterator::operator++()
                        _control_iter->x = DBL_MAX;
                        _control_iter->y = DBL_MAX;
                }
-       
+
                // Find the controller with the next earliest event time
                _control_iter = _control_iters.begin();
                for (ControlIterators::iterator i = _control_iters.begin();
@@ -303,7 +293,7 @@ Sequence<Time>::const_iterator::operator++()
                        earliest_t = _control_iter->x;
                }
        }
-       
+
        // Use the next earliest SysEx iff it's earlier than the controller
        if (_sysex_iter != _seq->sysexes().end()) {
                if (_type == NIL || (*_sysex_iter)->time() < earliest_t) {
@@ -315,26 +305,26 @@ Sequence<Time>::const_iterator::operator++()
        // 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;
        default:
-               DUMP("iterator = end\n");
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
                _is_end = true;
        }
 
@@ -362,28 +352,26 @@ template<typename Time>
 typename Sequence<Time>::const_iterator&
 Sequence<Time>::const_iterator::operator=(const const_iterator& other)
 {
-       if (_seq != other._seq) {
-               if (_locked) {
-                       _seq->read_unlock();
-               }
-               if (other._locked) {
-                  other._seq->read_lock();
-               }
-       } else if (!_locked && other._locked) {
-               _seq->read_lock();
-       }
-
        _seq           = other._seq;
        _event         = other._event;
        _active_notes  = other._active_notes;
        _type          = other._type;
        _is_end        = other._is_end;
-       _locked        = other._locked;
        _note_iter     = other._note_iter;
        _sysex_iter    = other._sysex_iter;
        _control_iters = other._control_iters;
-       size_t index   = other._control_iter - other._control_iters.begin();
-       _control_iter  = _control_iters.begin() + index;
+
+       if (other._lock)
+               _lock = _seq->read_lock();
+       else
+               _lock.reset();
+
+       if (other._control_iter == other._control_iters.end()) {
+               _control_iter = _control_iters.end();
+       } else {
+               const size_t index = other._control_iter - other._control_iters.begin();
+               _control_iter  = _control_iters.begin() + index;
+       }
 
        return *this;
 }
@@ -391,20 +379,44 @@ Sequence<Time>::const_iterator::operator=(const const_iterator& other)
 // Sequence
 
 template<typename Time>
-Sequence<Time>::Sequence(const TypeMap& type_map, size_t size)
-       : _read_iter(*this, DBL_MAX)
-       , _edited(false)
+Sequence<Time>::Sequence(const TypeMap& type_map)
+       : _edited(false)
        , _type_map(type_map)
-       , _notes(size)
        , _writing(false)
        , _end_iter(*this, DBL_MAX)
        , _percussive(false)
        , _lowest_note(127)
        , _highest_note(0)
 {
-       DUMP(format("Sequence (size %1%) constructed: %2%\n") % size % this);
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence constructed: %1\n", this));
+       assert(_end_iter._is_end);
+       assert( ! _end_iter._lock);
+}
+
+template<typename Time>
+Sequence<Time>::Sequence(const Sequence<Time>& other)
+       : ControlSet (other)
+        , _edited(false)
+       , _type_map(other._type_map)
+       , _writing(false)
+       , _end_iter(*this, DBL_MAX)
+       , _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));
+                _notes.insert (n);
+        }
+
+        for (typename SysExes::const_iterator i = other._sysexes.begin(); i != other._sysexes.end(); ++i) {
+                boost::shared_ptr<Event<Time> > n (new Event<Time> (**i, true));
+                _sysexes.push_back (n);
+        }
+
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence copied: %1\n", this));
        assert(_end_iter._is_end);
-       assert( ! _end_iter._locked);
+       assert(! _end_iter._lock);
 }
 
 /** Write the controller event pointed to by \a iter to \a ev.
@@ -420,12 +432,12 @@ Sequence<Time>::control_to_midi_event(
 {
        assert(iter.list.get());
        const uint32_t event_type = iter.list->parameter().type();
-       
+
        // initialize the event pointer with a new event, if necessary
        if (!ev) {
                ev = boost::shared_ptr< Event<Time> >(new Event<Time>(event_type, 0, 3, NULL, true));
        }
-       
+
        uint8_t midi_type = _type_map.parameter_midi_type(iter.list->parameter());
        ev->set_event_type(_type_map.midi_event_type(midi_type));
        switch (midi_type) {
@@ -434,7 +446,7 @@ Sequence<Time>::control_to_midi_event(
                assert(iter.list->parameter().channel() < 16);
                assert(iter.list->parameter().id() <= INT8_MAX);
                assert(iter.y <= INT8_MAX);
-               
+
                ev->time() = iter.x;
                ev->realloc(3);
                ev->buffer()[0] = MIDI_CMD_CONTROL + iter.list->parameter().channel();
@@ -446,7 +458,7 @@ Sequence<Time>::control_to_midi_event(
                assert(iter.list.get());
                assert(iter.list->parameter().channel() < 16);
                assert(iter.y <= INT8_MAX);
-               
+
                ev->time() = iter.x;
                ev->realloc(2);
                ev->buffer()[0] = MIDI_CMD_PGM_CHANGE + iter.list->parameter().channel();
@@ -457,7 +469,7 @@ Sequence<Time>::control_to_midi_event(
                assert(iter.list.get());
                assert(iter.list->parameter().channel() < 16);
                assert(iter.y < (1<<14));
-               
+
                ev->time() = iter.x;
                ev->realloc(3);
                ev->buffer()[0] = MIDI_CMD_BENDER + iter.list->parameter().channel();
@@ -489,12 +501,10 @@ template<typename Time>
 void
 Sequence<Time>::clear()
 {
-       _lock.writer_lock();
+       WriteLock lock(write_lock());
        _notes.clear();
        for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li)
                li->second->list()->clear();
-       _read_iter = end();
-       _lock.writer_unlock();
 }
 
 /** Begin a write of events to the model.
@@ -508,14 +518,13 @@ template<typename Time>
 void
 Sequence<Time>::start_write()
 {
-       DUMP(format("%1% : start_write (percussive = %2%)\n") % this % _percussive);
-       write_lock();
+       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();
-       write_unlock();
 }
 
 /** Finish a write of events to the model.
@@ -526,26 +535,29 @@ Sequence<Time>::start_write()
  */
 template<typename Time>
 void
-Sequence<Time>::end_write(bool delete_stuck)
+Sequence<Time>::end_write (bool delete_stuck)
 {
-       write_lock();
-       assert(_writing);
+       WriteLock lock(write_lock());
 
-       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() ;) {
-                       if ((*n)->length() == 0) {
-                               cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
-                               n = _notes.erase(n);
-                               // we have to break here because erase invalidates the iterator
-                               break;
-                       } else {
-                               ++n;
-                       }
-               }
+       if (!_writing) {
+               return;
        }
 
+       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()) {
                        cerr << "WARNING: Sequence<Time>::end_write: Channel " << i << " has "
@@ -557,14 +569,83 @@ Sequence<Time>::end_write(bool delete_stuck)
        for (ControlLists::const_iterator i = _dirty_controls.begin(); i != _dirty_controls.end(); ++i) {
                (*i)->mark_dirty();
        }
-       
+
        _writing = false;
-       write_unlock();
+}
+
+
+template<typename Time>
+bool
+Sequence<Time>::add_note_unlocked(const boost::shared_ptr< Note<Time> > note)
+{
+        /* 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 (contains_unlocked (note)) {
+                return false;
+       }
+
+        if (overlaps_unlocked (note)) {
+                return false;
+        }
+
+       _edited = true;
+
+       if (note->note() < _lowest_note)
+               _lowest_note = note->note();
+       if (note->note() > _highest_note)
+               _highest_note = note->note();
+
+       _notes.insert(note);
+
+        return true;
+}
+
+template<typename Time>
+void
+Sequence<Time>::remove_note_unlocked(const boost::shared_ptr< const Note<Time> > note)
+{
+        bool erased = false;
+
+       _edited = true;
+
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("%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);
+
+                        if ((*i)->note() == _lowest_note || (*i)->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;
+               }
+                
+       }
+
+        if (!erased) {
+                cerr << "Unable to find note to erase" << endl;
+        }
 }
 
 /** Append \a ev to model.  NOT realtime safe.
  *
- * Timestamps of events in \a buf are expected to be relative to
+ * 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.
  */
@@ -572,24 +653,25 @@ template<typename Time>
 void
 Sequence<Time>::append(const Event<Time>& event)
 {
-       write_lock();
+       WriteLock lock(write_lock());
        _edited = true;
-       
+
        const MIDIEvent<Time>& ev = (const MIDIEvent<Time>&)event;
 
-       assert(_notes.empty() || ev.time() >= _notes.back()->time());
+       assert(_notes.empty() || ev.time() >= (*_notes.rbegin())->time());
        assert(_writing);
 
        if (!midi_event_is_valid(ev.buffer(), ev.size())) {
                cerr << "WARNING: Sequence ignoring illegal MIDI event" << endl;
-               write_unlock();
                return;
        }
 
        if (ev.is_note_on()) {
-               append_note_on_unlocked(ev.channel(), ev.time(), ev.note(), ev.velocity());
+                boost::shared_ptr< Note<Time> > note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+               append_note_on_unlocked (note);
        } else if (ev.is_note_off()) {
-               append_note_off_unlocked(ev.channel(), ev.time(), ev.note());
+                boost::shared_ptr< Note<Time> > note(new Note<Time>(ev.channel(), ev.time(), 0, ev.note(), ev.velocity()));
+               append_note_off_unlocked (note);
        } else if (ev.is_sysex()) {
                append_sysex_unlocked(ev);
        } else if (!_type_map.type_is_midi(ev.event_type())) {
@@ -618,81 +700,78 @@ Sequence<Time>::append(const Event<Time>& event)
        } else {
                printf("WARNING: Sequence: Unknown MIDI event type %X\n", ev.type());
        }
-
-       write_unlock();
 }
 
 template<typename Time>
 void
-Sequence<Time>::append_note_on_unlocked(uint8_t chan, Time time, uint8_t note_num, uint8_t velocity)
+Sequence<Time>::append_note_on_unlocked (boost::shared_ptr< Note<Time> > note)
 {
-       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);
+       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 (velocity == 0) {
-               append_note_off_unlocked(chan, time, note_num);
+       if (note->velocity() == 0) {
+               append_note_off_unlocked (note);
                return;
        }
 
-       if (note_num < _lowest_note)
-               _lowest_note = note_num;
-       if (note_num > _highest_note)
-               _highest_note = note_num;
-
-       boost::shared_ptr< Note<Time> > new_note(new Note<Time>(chan, time, 0, note_num, velocity));
-       _notes.push_back(new_note);
+        add_note_unlocked (note);
+        
        if (!_percussive) {
-               DUMP(format("Sustained: Appending active note on %1% channel %2%\n")
-                               % (unsigned)(uint8_t)note_num % chan);
-               _write_notes[chan].push_back(_notes.size() - 1);
+               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 {
-               DUMP("Percussive: NOT appending active note on\n");
-        }
+                DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n");
+       }
 }
 
 template<typename Time>
 void
-Sequence<Time>::append_note_off_unlocked(uint8_t chan, Time time, uint8_t note_num)
+Sequence<Time>::append_note_off_unlocked (boost::shared_ptr< Note<Time> > note)
 {
-       DUMP(format("%1% c=%2% note %3% off @ %4%\n")
-                       % this % (int)chan % (int)note_num % time);
-       assert(note_num <= 127);
-       assert(chan < 16);
+       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) {
-               DUMP("Sequence Ignoring note off (percussive mode)\n");
+                DEBUG_TRACE(DEBUG::Sequence, "Sequence Ignoring note off (percussive mode)\n");
                return;
        }
 
-       /* FIXME: make _write_notes fixed size (127 noted) for speed */
+       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.
+        */
 
-       /* FIXME: note off velocity for that one guy out there who actually has
-        * keys that send it */
+       for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ++n) {
+               boost::shared_ptr< Note<Time> > nn = *n;
+               if (note->note() == nn->note() && nn->channel() == note->channel()) {
+                       assert(note->time() >= nn->time());
 
-       bool resolved = false;
+                       nn->set_length (note->time() - nn->time());
+                        nn->set_off_velocity (note->velocity());
 
-       for (WriteNotes::iterator n = _write_notes[chan].begin(); n
-                       != _write_notes[chan].end(); ++n) {
-               Note<Time>& note = *_notes[*n].get();
-               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());
+                       _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)chan
-                               << ", note " << (int)note_num << " @ " << time << endl;
+               cerr << this << " spurious note off chan " << (int)note->channel()
+                     << ", note " << (int)note->note() << " @ " << note->time() << endl;
        }
 }
 
@@ -700,8 +779,8 @@ template<typename Time>
 void
 Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value)
 {
-       DUMP(format("%1% %2% @ %3%\t=\t%4% # controls: %5%\n")
-                       % this % _type_map.to_symbol(param) % time % value % _controls.size());
+       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);
 }
@@ -722,31 +801,148 @@ Sequence<Time>::append_sysex_unlocked(const MIDIEvent<Time>& ev)
 }
 
 template<typename Time>
-void
-Sequence<Time>::add_note_unlocked(const boost::shared_ptr< Note<Time> > note)
+bool
+Sequence<Time>::contains (const boost::shared_ptr< Note<Time> > note) const
 {
-       DUMP(format("%1% add note %2% @ %3%\n") % this % (int)note->note() % note->time());
-       _edited = true;
-       typename Notes::iterator i = upper_bound(_notes.begin(), _notes.end(), note,
-                       note_time_comparator);
-       _notes.insert(i, note);
+        return contains_unlocked (note);
 }
 
 template<typename Time>
-void
-Sequence<Time>::remove_note_unlocked(const boost::shared_ptr< const Note<Time> > note)
+bool
+Sequence<Time>::contains_unlocked (const boost::shared_ptr< Note<Time> > note) const
 {
-       _edited = true;
-       DUMP(format("%1% remove note %2% @ %3%\n") % this % (int)note->note() % note->time());
-       for (typename Notes::iterator n = _notes.begin(); n != _notes.end(); ++n) {
-               if (*(*n) == *note) {
-                       _notes.erase(n);
-                       break;
+       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;
                }
        }
+        return false;
+}
+
+template<typename Time>
+bool
+Sequence<Time>::overlaps (const boost::shared_ptr< Note<Time> > note) const
+{
+        ReadLock lock (read_lock());
+        return overlaps_unlocked (note);
+}
+
+template<typename Time>
+bool
+Sequence<Time>::overlaps_unlocked (const boost::shared_ptr< Note<Time> > note) const
+{
+        Time sa = note->time();
+        Time ea  = note->end_time();
+
+       for (typename Sequence<Time>::Notes::const_iterator i = note_lower_bound (note->time()); i != _notes.end(); ++i) {
+
+                if ((note->note() != (*i)->note()) ||
+                    (note->channel() != (*i)->channel())) {
+                        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
+{
+       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;
+}
+
+template<typename Time>
+void
+Sequence<Time>::get_notes (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 PitchEqual:
+                        if ((*i)->note() == val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchLessThan:
+                        if ((*i)->note() < val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchLessThanOrEqual:
+                        if ((*i)->note() <= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchGreater:
+                        if ((*i)->note() > val) {
+                                n.insert (*i);
+                        }
+                        break;
+                case PitchGreaterThanOrEqual:
+                        if ((*i)->note() >= val) {
+                                n.insert (*i);
+                        }
+                        break;
+                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;
+                }
+        }
 }
 
-template class Sequence<double>;
+template class Sequence<Evoral::MusicalTime>;
 
 } // namespace Evoral