rationale pathways that add notes to Sequence<T> so that there is only final insertio...
[ardour.git] / libs / evoral / src / Sequence.cpp
index 1facd6761ef1befea21206218c72dffeb103f581..af7b3c033607be7ab7654b1fd6dc312066683504 100644 (file)
 /* 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
  */
 
 #define __STDC_LIMIT_MACROS 1
-
-#include <iostream>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <limits>
 #include <stdexcept>
 #include <stdint.h>
-#include <evoral/Sequence.hpp>
-#include <evoral/ControlList.hpp>
-#include <evoral/Control.hpp>
-#include <evoral/ControlSet.hpp>
-#include <evoral/EventSink.hpp>
-#include <evoral/MIDIParameters.hpp>
-#include <evoral/TypeMap.hpp>
+#include <cstdio>
 
-using namespace std;
+#include "pbd/compose.h"
 
-namespace Evoral {
+#include "evoral/Control.hpp"
+#include "evoral/ControlList.hpp"
+#include "evoral/ControlSet.hpp"
+#include "evoral/EventSink.hpp"
+#include "evoral/MIDIParameters.hpp"
+#include "evoral/Sequence.hpp"
+#include "evoral/TypeMap.hpp"
+#include "evoral/midi_util.h"
 
-void Sequence::write_lock() {
-       _lock.writer_lock();
-       _control_lock.lock();
-}
+using namespace std;
+using namespace PBD;
 
-void Sequence::write_unlock() {
-       _lock.writer_unlock();
-       _control_lock.unlock();
-}
+namespace Evoral {
 
-void Sequence::read_lock() const {
-       _lock.reader_lock();
-}
+// Read iterator (const_iterator)
 
-void Sequence::read_unlock() const {
-       _lock.reader_unlock();
+template<typename Time>
+Sequence<Time>::const_iterator::const_iterator()
+       : _seq(NULL)
+       , _is_end(true)
+       , _control_iter(_control_iters.end())
+{
+       _event = boost::shared_ptr< Event<Time> >(new Event<Time>());
 }
 
-struct null_ostream : public std::ostream {
-       null_ostream(): std::ios(0), std::ostream(0) {}
-};
-static null_ostream nullout;
-
-//static ostream& debugout = cout;
-static ostream& debugout = nullout;
-static ostream& errorout = cerr;
-
-// Read iterator (const_iterator)
-
-Sequence::const_iterator::const_iterator(const Sequence& seq, EventTime t)
+template<typename Time>
+Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t)
        : _seq(&seq)
-       , _is_end( (t == DBL_MAX) || seq.empty() )
-       , _locked( !_is_end )
+       , _type(NIL)
+       , _is_end((t == DBL_MAX) || seq.empty())
+       , _note_iter(seq.notes().end())
+       , _sysex_iter(seq.sysexes().end())
+       , _control_iter(_control_iters.end())
 {
-       debugout << "Created Iterator @ " << t << " (is end: " << _is_end << ")" << endl;
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Created Iterator @ %1 (is end: %2)\n)", t, _is_end));
 
-       if (_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 (Sequence::Notes::const_iterator i = seq.notes().begin(); i != seq.notes().end(); ++i) {
+       // 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) {
-                       _note_iter = i;
+                       _sysex_iter = i;
                        break;
                }
        }
+       assert(_sysex_iter == seq.sysexes().end() || (*_sysex_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());
-       
-       // find the earliest control event available
+       bool   found                  = false;
+       size_t earliest_control_index = 0;
        for (Controls::const_iterator i = seq._controls.begin(); i != seq._controls.end(); ++i) {
-               debugout << "Iterator: control: " << i->first.symbol() << endl;
+               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) {
-                       debugout << "Iterator: CC " << i->first.id() << " (size " << i->second->list()->size()
-                               << ") has no events past " << t << endl;
+                       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;
                }
 
                assert(x >= 0);
 
-               /*if (y < i->first.min() || y > i->first.max()) {
-                       errorout << "ERROR: Controller " << i->first.symbol() << " value " << y
+               if (y < i->first.min() || y > i->first.max()) {
+                       cerr << "ERROR: Controller value " << y
                                << " out of range [" << i->first.min() << "," << i->first.max()
                                << "], event ignored" << endl;
                        continue;
-               }*/
+               }
 
-               const ControlIterator new_iter(i->second->list(), x, y);
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 added (%2, %3)\n", i->first.id(), x, y));
 
-               debugout << "Iterator: CC " << i->first.id() << " added (" << x << ", " << y << ")" << endl;
+               const ControlIterator new_iter(i->second->list(), x, y);
                _control_iters.push_back(new_iter);
 
-               // if the x of the current control is less than earliest_control
-               // we have a new earliest_control
+               // Found a new earliest_control
                if (x < earliest_control.x) {
                        earliest_control = new_iter;
-                       _control_iter = _control_iters.end();
-                       --_control_iter;
-                       // now _control_iter points to the last Element in _control_iters
+                       earliest_control_index = _control_iters.size() - 1;
+                       found = true;
                }
        }
 
-       if (_note_iter != seq.notes().end()
-                       && (*_note_iter)->on_event().time() >= t
-                       && (!earliest_control.list
-                               || (*_note_iter)->on_event().time() < earliest_control.x)) {
-               debugout << "Reading note on event @ " << (*_note_iter)->on_event().time() << endl;
-               _event = boost::shared_ptr<Event>(new Event((*_note_iter)->on_event(), true));
-               _active_notes.push(*_note_iter);
-               ++_note_iter;
+       if (found) {
+               _control_iter = _control_iters.begin() + earliest_control_index;
+               assert(_control_iter != _control_iters.end());
+       } else {
                _control_iter = _control_iters.end();
-       } else if (earliest_control.list) {
-               debugout << "Reading control event @ " << earliest_control.x << endl;
+       }
+
+       // Now find the earliest event overall and point to it
+       Time earliest_t = t;
+
+       if (_note_iter != seq.notes().end()) {
+               _type = NOTE_ON;
+               earliest_t = (*_note_iter)->time();
+       }
+
+       if (_sysex_iter != seq.sysexes().end()
+                       && ((*_sysex_iter)->time() < earliest_t || _type == NIL)) {
+               _type = SYSEX;
+               earliest_t = (*_sysex_iter)->time();
+       }
+
+       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:
+               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:
+               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:
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at control event @ %1\n", earliest_t));
                seq.control_to_midi_event(_event, earliest_control);
+               break;
+       default:
+               break;
        }
 
-       if ( (! _event.get()) || _event->size() == 0) {
-               debugout << "New iterator @ " << t << " is at end." << endl;
+       if (_type == NIL || !_event || _event->size() == 0) {
+               DEBUG_TRACE (DEBUG::Sequence, string_compose ("Starting at end @ %1\n", t));
+               _type   = NIL;
                _is_end = true;
-
-               // eliminate possible race condition here (ugly)
-               static Glib::Mutex mutex;
-               Glib::Mutex::Lock lock(mutex);
-               if (_locked) {
-                       _seq->read_unlock();
-                       _locked = false;
-               }
        } else {
-               debugout << "New Iterator = " << _event->event_type();
-               debugout << " : " << hex << (int)((MIDIEvent*)_event.get())->type();
-               debugout << " @ " <<  _event->time() << endl;
+               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()));
        }
+}
 
-       //assert(_is_end || (_event->buffer() && _event->buffer()[0] != '\0'));
+template<typename Time>
+Sequence<Time>::const_iterator::~const_iterator()
+{
 }
 
-Sequence::const_iterator::~const_iterator()
+template<typename Time>
+void
+Sequence<Time>::const_iterator::invalidate()
 {
-       if (_locked) {
-               _seq->read_unlock();
+       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();
 }
 
-const
-Sequence::const_iterator& Sequence::const_iterator::operator++()
+template<typename Time>
+const typename Sequence<Time>::const_iterator&
+Sequence<Time>::const_iterator::operator++()
 {
        if (_is_end) {
                throw std::logic_error("Attempt to iterate past end of Sequence");
        }
-       
-       debugout << "Iterator ++" << endl;
-       assert(_event->buffer() && _event->size() > 0);
-       
-       const MIDIEvent& ev = *((MIDIEvent*)_event.get());
 
-       //debugout << "const_iterator::operator++: " << _event->to_string() << endl;
+       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() || ev.is_cc() || ev.is_pgm_change()
-                               || ev.is_pitch_bender() || ev.is_channel_pressure()) ) {
-               errorout << "Unknown event type: " << hex << int(ev.buffer()[0])
-                       << int(ev.buffer()[1]) << int(ev.buffer()[2]) << endl;
+       if (!(     ev.is_note()
+                       || ev.is_cc()
+                       || ev.is_pgm_change()
+                       || ev.is_pitch_bender()
+                       || ev.is_channel_pressure()
+                       || ev.is_sysex()) ) {
+               cerr << "WARNING: Unknown event (type " << _type << "): " << hex
+                       << int(ev.buffer()[0]) << int(ev.buffer()[1]) << int(ev.buffer()[2]) << endl;
        }
-       assert((ev.is_note() || ev.is_cc() || ev.is_pgm_change() || ev.is_pitch_bender() || ev.is_channel_pressure()));
 
-       // Increment past current control event
-       if (!ev.is_note() && _control_iter != _control_iters.end() && _control_iter->list.get()) {
-               double x = 0.0, y = 0.0;
-               const bool ret = _control_iter->list->rt_safe_earliest_event_unlocked(
-                               _control_iter->x, DBL_MAX, x, y, false);
+       double x   = 0.0;
+       double y   = 0.0;
+       bool   ret = false;
 
+       // Increment past current event
+       switch (_type) {
+       case NOTE_ON:
+               ++_note_iter;
+               break;
+       case NOTE_OFF:
+               break;
+       case CONTROL:
+               // Increment current controller iterator
+               ret = _control_iter->list->rt_safe_earliest_event_unlocked(
+                               _control_iter->x, DBL_MAX, x, y, false);
                assert(!ret || x > _control_iter->x);
-
                if (ret) {
                        _control_iter->x = x;
                        _control_iter->y = y;
@@ -203,57 +251,80 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
                        _control_iter->x = DBL_MAX;
                        _control_iter->y = DBL_MAX;
                }
-       }
-
-       _control_iter = _control_iters.begin();
 
-       // find the _control_iter with the earliest event time
-       for (ControlIterators::iterator i = _control_iters.begin(); i != _control_iters.end(); ++i) {
-               if (i->x < _control_iter->x) {
-                       _control_iter = i;
+               // Find the controller with the next earliest event time
+               _control_iter = _control_iters.begin();
+               for (ControlIterators::iterator i = _control_iters.begin();
+                               i != _control_iters.end(); ++i) {
+                       if (i->x < _control_iter->x) {
+                               _control_iter = i;
+                       }
                }
+               break;
+       case SYSEX:
+               ++_sysex_iter;
+               break;
+       default:
+               assert(false);
        }
 
-       enum Type {NIL, NOTE_ON, NOTE_OFF, CONTROL};
-
-       Type type = NIL;
-       EventTime t = 0;
+       // Now find the earliest event overall and point to it
+       _type = NIL;
+       Time earliest_t = std::numeric_limits<Time>::max();
 
        // Next earliest note on
        if (_note_iter != _seq->notes().end()) {
-               type = NOTE_ON;
-               t = (*_note_iter)->time();
+               _type = NOTE_ON;
+               earliest_t = (*_note_iter)->time();
        }
 
-       // Use the next earliest note off iff it's earlier than the note on
-       if (!_seq->percussive() && (! _active_notes.empty())) {
-               if (type == NIL || _active_notes.top()->end_time() <= t) {
-                       type = NOTE_OFF;
-                       t = _active_notes.top()->end_time();
+       // Use the next note off iff it's earlier or the same time as the note on
+       if (!_seq->percussive() && (!_active_notes.empty())) {
+               if (_type == NIL || _active_notes.top()->end_time() <= earliest_t) {
+                       _type = NOTE_OFF;
+                       earliest_t = _active_notes.top()->end_time();
                }
        }
 
        // Use the next earliest controller iff it's earlier than the note event
        if (_control_iter != _control_iters.end() && _control_iter->x != DBL_MAX) {
-               if (type == NIL || _control_iter->x < t) {
-                       type = CONTROL;
+               if (_type == NIL || _control_iter->x < earliest_t) {
+                       _type = CONTROL;
+                       earliest_t = _control_iter->x;
                }
        }
 
-       if (type == NOTE_ON) {
-               debugout << "Iterator = note on" << endl;
+       // 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) {
+                       _type = SYSEX;
+                       earliest_t = (*_sysex_iter)->time();
+               }
+       }
+
+       // Set event to reflect new position
+       switch (_type) {
+       case NOTE_ON:
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = note on\n");
                *_event = (*_note_iter)->on_event();
                _active_notes.push(*_note_iter);
-               ++_note_iter;
-       } else if (type == NOTE_OFF) {
-               debugout << "Iterator = note off" << endl;
+               break;
+       case NOTE_OFF:
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = note off\n");
+               assert(!_active_notes.empty());
                *_event = _active_notes.top()->off_event();
                _active_notes.pop();
-       } else if (type == CONTROL) {
-               debugout << "Iterator = control" << endl;
+               break;
+       case CONTROL:
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = control\n");
                _seq->control_to_midi_event(_event, *_control_iter);
-       } else {
-               debugout << "Iterator = End" << endl;
+               break;
+       case SYSEX:
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = sysex\n");
+               *_event = *(*_sysex_iter);
+               break;
+       default:
+                DEBUG_TRACE(DEBUG::Sequence, "iterator = end\n");
                _is_end = true;
        }
 
@@ -262,42 +333,44 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
        return *this;
 }
 
+template<typename Time>
 bool
-Sequence::const_iterator::operator==(const const_iterator& other) const
+Sequence<Time>::const_iterator::operator==(const const_iterator& other) const
 {
-       if (_is_end || other._is_end) {
+       if (_seq != other._seq) {
+               return false;
+       } else if (_is_end || other._is_end) {
                return (_is_end == other._is_end);
+       } else if (_type != other._type) {
+               return false;
        } else {
                return (_event == other._event);
        }
 }
 
-Sequence::const_iterator&
-Sequence::const_iterator::operator=(const const_iterator& other)
+template<typename Time>
+typename Sequence<Time>::const_iterator&
+Sequence<Time>::const_iterator::operator=(const const_iterator& other)
 {
-       if (_locked && _seq != other._seq) {
-               _seq->read_unlock();
-       }
-
        _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 (!_is_end && other._event) {
-               if (_event) {
-                       *_event = *other._event.get();
-               } else {
-                       _event = boost::shared_ptr<Event>(new Event(*other._event, true));
-               }
+
+       if (other._lock)
+               _lock = _seq->read_lock();
+       else
+               _lock.reset();
+
+       if (other._control_iter == other._control_iters.end()) {
+               _control_iter = _control_iters.end();
        } else {
-               if (_event) {
-                       _event->clear();
-               }
+               const size_t index = other._control_iter - other._control_iters.begin();
+               _control_iter  = _control_iters.begin() + index;
        }
 
        return *this;
@@ -305,64 +378,45 @@ Sequence::const_iterator::operator=(const const_iterator& other)
 
 // Sequence
 
-Sequence::Sequence(const TypeMap& type_map, size_t size)
-       : _read_iter(*this, DBL_MAX)
-       , _edited(false)
+template<typename Time>
+Sequence<Time>::Sequence(const TypeMap& type_map)
+       : _edited(false)
        , _type_map(type_map)
-       , _notes(size)
        , _writing(false)
        , _end_iter(*this, DBL_MAX)
-       , _next_read(UINT32_MAX)
        , _percussive(false)
        , _lowest_note(127)
        , _highest_note(0)
 {
-       debugout << "Sequence (size " << size << ") constructed: " << this << endl;
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence constructed: %1\n", this));
        assert(_end_iter._is_end);
-       assert( ! _end_iter._locked);
+       assert( ! _end_iter._lock);
 }
 
-/** Read events in frame range \a start .. \a start+cnt into \a dst,
- * adding \a offset to each event's timestamp.
- * \return number of events written to \a dst
- */
-size_t
-Sequence::read(EventSink& dst, timestamp_t start, timedur_t nframes, timestamp_t offset) const
+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)
 {
-       debugout << this << " read @ " << start << " * " << nframes << " + " << offset << endl;
-       debugout << this << " # notes: " << n_notes() << endl;
-       debugout << this << " # controls: " << _controls.size() << endl;
+        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);
+        }
 
-       size_t read_events = 0;
+        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);
+        }
 
-       if (start != _next_read) {
-               debugout << "Repositioning iterator from " << _next_read << " to " << start << endl;
-               _read_iter = const_iterator(*this, (double)start);
-       } else {
-               debugout << "Using cached iterator at " << _next_read << endl;
-       }
-
-       _next_read = (nframes_t) floor (start + nframes);
-
-       while (_read_iter != end() && _read_iter->time() < start + nframes) {
-               assert(_read_iter->size() > 0);
-               assert(_read_iter->buffer());
-               dst.write(_read_iter->time() + offset,
-                         _read_iter->event_type(),
-                         _read_iter->size(), 
-                         _read_iter->buffer());
-               
-                debugout << this << " read event type " << _read_iter->event_type()
-                        << " @ " << _read_iter->time() << " : ";
-                for (size_t i = 0; i < _read_iter->size(); ++i)
-                        debugout << hex << (int)_read_iter->buffer()[i];
-                debugout << endl;
-               
-               ++_read_iter;
-               ++read_events;
-       }
-
-       return read_events;
+       DEBUG_TRACE (DEBUG::Sequence, string_compose ("Sequence copied: %1\n", this));
+       assert(_end_iter._is_end);
+       assert(! _end_iter._lock);
 }
 
 /** Write the controller event pointed to by \a iter to \a ev.
@@ -370,15 +424,20 @@ Sequence::read(EventSink& dst, timestamp_t start, timedur_t nframes, timestamp_t
  * The event_type of \a ev should be set to the expected output type.
  * \return true on success
  */
+template<typename Time>
 bool
-Sequence::control_to_midi_event(boost::shared_ptr<Event>& ev, const ControlIterator& iter) const
+Sequence<Time>::control_to_midi_event(
+               boost::shared_ptr< Event<Time> >& ev,
+               const ControlIterator&            iter) const
 {
        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>(new Event(event_type, 0, 3, NULL, true));
+               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) {
@@ -387,7 +446,7 @@ Sequence::control_to_midi_event(boost::shared_ptr<Event>& ev, const ControlItera
                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();
@@ -399,7 +458,7 @@ Sequence::control_to_midi_event(boost::shared_ptr<Event>& ev, const ControlItera
                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();
@@ -410,7 +469,7 @@ Sequence::control_to_midi_event(boost::shared_ptr<Event>& ev, const ControlItera
                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();
@@ -438,16 +497,14 @@ Sequence::control_to_midi_event(boost::shared_ptr<Event>& ev, const ControlItera
 
 /** Clear all events from the model.
  */
+template<typename Time>
 void
-Sequence::clear()
+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();
-       _next_read = 0;
-       _read_iter = end();
-       _lock.writer_unlock();
 }
 
 /** Begin a write of events to the model.
@@ -457,17 +514,17 @@ Sequence::clear()
  * stored; note off events are discarded entirely and all contained notes will
  * have length 0.
  */
+template<typename Time>
 void
-Sequence::start_write()
+Sequence<Time>::start_write()
 {
-       debugout << this << " START WRITE, PERCUSSIVE = " << _percussive << endl;
-       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)
+       for (int i = 0; i < 16; ++i) {
                _write_notes[i].clear();
-       
+       }
        _dirty_controls.clear();
-       write_unlock();
 }
 
 /** Finish a write of events to the model.
@@ -476,30 +533,34 @@ Sequence::start_write()
  * that were never resolved with a corresonding note off will be deleted.
  * Otherwise they will remain as notes with length 0.
  */
+template<typename Time>
 void
-Sequence::end_write(bool delete_stuck)
+Sequence<Time>::end_write (bool delete_stuck)
 {
-       write_lock();
-       assert(_writing);
+       WriteLock lock(write_lock());
 
-       debugout << this << " END WRITE: " << _notes.size() << " NOTES\n";
-
-       if (!_percussive && delete_stuck) {
-               for (Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
-                       if ((*n)->length() == 0) {
-                               errorout << "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()) {
-                       errorout << "WARNING: Sequence::end_write: Channel " << i << " has "
+                       cerr << "WARNING: Sequence<Time>::end_write: Channel " << i << " has "
                                        << _write_notes[i].size() << " stuck notes" << endl;
                }
                _write_notes[i].clear();
@@ -508,35 +569,117 @@ Sequence::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.
  */
+template<typename Time>
 void
-Sequence::append(const Event& event)
+Sequence<Time>::append(const Event<Time>& event)
 {
-       write_lock();
+       WriteLock lock(write_lock());
        _edited = true;
-       
-       const MIDIEvent& ev = (const MIDIEvent&)event;
 
-       assert(_notes.empty() || ev.time() >= _notes.back()->time());
+       const MIDIEvent<Time>& ev = (const MIDIEvent<Time>&)event;
+
+       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;
+               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())) {
-               printf("WARNING: Sequence: Unknown event type %X\n", 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()),
@@ -557,131 +700,249 @@ Sequence::append(const Event& event)
        } else {
                printf("WARNING: Sequence: Unknown MIDI event type %X\n", ev.type());
        }
-
-       write_unlock();
 }
 
+template<typename Time>
 void
-Sequence::append_note_on_unlocked(uint8_t chan, EventTime time, uint8_t note_num, uint8_t velocity)
+Sequence<Time>::append_note_on_unlocked (boost::shared_ptr< Note<Time> > note)
 {
-       debugout << this << " c" << (int)chan << " note " << (int)note_num << " off @ " << time << endl;
-       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 (note_num < _lowest_note)
-               _lowest_note = note_num;
-       if (note_num > _highest_note)
-               _highest_note = note_num;
+       if (note->velocity() == 0) {
+               append_note_off_unlocked (note);
+               return;
+       }
 
-       boost::shared_ptr<Note> new_note(new Note(chan, time, 0, note_num, velocity));
-       _notes.push_back(new_note);
+        add_note_unlocked (note);
+        
        if (!_percussive) {
-               debugout << "Sustained: Appending active note on " << (unsigned)(uint8_t)note_num << endl;
-               _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 {
-               debugout << "Percussive: NOT appending active note on" << endl;
-        }
+                DEBUG_TRACE(DEBUG::Sequence, "Percussive: NOT appending active note on\n");
+       }
 }
 
+template<typename Time>
 void
-Sequence::append_note_off_unlocked(uint8_t chan, EventTime time, uint8_t note_num)
+Sequence<Time>::append_note_off_unlocked (boost::shared_ptr< Note<Time> > note)
 {
-       debugout << this << " c" << (int)chan << " note " << (int)note_num << " off @ " << time << endl;
-       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) {
-               debugout << "Sequence Ignoring note off (percussive mode)" << endl;
+                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;
 
-       /* FIXME: note off velocity for that one guy out there who actually has
-        * keys that send it */
+        /* _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.
+        */
 
-       bool resolved = false;
+       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());
 
-       for (WriteNotes::iterator n = _write_notes[chan].begin(); n
-                       != _write_notes[chan].end(); ++n) {
-               Note& note = *_notes[*n].get();
-               if (note.note() == note_num) {
-                       assert(time >= note.time());
-                       note.set_length(time - note.time());
-                       _write_notes[chan].erase(n);
-                       debugout << "resolved note, length: " << note.length() << endl;
+                       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) {
-               errorout << 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;
        }
 }
 
+template<typename Time>
 void
-Sequence::append_control_unlocked(const Parameter& param, EventTime time, double value)
+Sequence<Time>::append_control_unlocked(const Parameter& param, Time time, double value)
 {
-       debugout << this << " " << param.symbol() << " @ " << time << " \t= \t" << value
-                       << " # controls: " << _controls.size() << endl;
-       control(param, true)->list()->rt_add(time, 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::add_note_unlocked(const boost::shared_ptr<Note> note)
+Sequence<Time>::append_sysex_unlocked(const MIDIEvent<Time>& ev)
 {
-       debugout << this << " add note " << (int)note->note() << " @ " << note->time() << endl;
-       _edited = true;
-       Notes::iterator i = upper_bound(_notes.begin(), _notes.end(), note,
-                       note_time_comparator);
-       _notes.insert(i, 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
+
+       boost::shared_ptr<MIDIEvent<Time> > event(new MIDIEvent<Time>(ev, true));
+       _sysexes.push_back(event);
 }
 
-void
-Sequence::remove_note_unlocked(const boost::shared_ptr<const Note> note)
+template<typename Time>
+bool
+Sequence<Time>::contains (const boost::shared_ptr< Note<Time> > note) const
 {
-       _edited = true;
-       debugout << this << " remove note " << (int)note->note() << " @ " << note->time() << endl;
-       for (Notes::iterator n = _notes.begin(); n != _notes.end(); ++n) {
-               Note& _n = *(*n);
-               const Note& _note = *note;
-               // TODO: There is still the issue, that after restarting ardour
-               // persisted undo does not work, because of rounding errors in the
-               // event times after saving/restoring to/from MIDI files
-               /*cerr << "======================================= " << endl;
-               cerr << int(_n.note()) << "@" << int(_n.time()) << "[" << int(_n.channel()) << "] --" << int(_n.length()) << "-- #" << int(_n.velocity()) << endl;
-               cerr << int(_note.note()) << "@" << int(_note.time()) << "[" << int(_note.channel()) << "] --" << int(_note.length()) << "-- #" << int(_note.velocity()) << endl;
-               cerr << "Equal: " << bool(_n == _note) << endl;
-               cerr << endl << endl;*/
-               if (_n == _note) {
-                       _notes.erase(n);
-                       // we have to break here, because erase invalidates all iterators, ie. n itself
-                       break;
+        return contains_unlocked (note);
+}
+
+template<typename Time>
+bool
+Sequence<Time>::contains_unlocked (const boost::shared_ptr< Note<Time> > note) const
+{
+       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;
 }
 
-/** Slow!  for debugging only. */
-#ifndef NDEBUG
+template<typename Time>
 bool
-Sequence::is_sorted() const {
-       bool t = 0;
-       for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n)
-               if ((*n)->time() < t)
-                       return false;
-               else
-                       t = (*n)->time();
+Sequence<Time>::overlaps (const boost::shared_ptr< Note<Time> > note) const
+{
+        ReadLock lock (read_lock());
+        return overlaps_unlocked (note);
+}
 
-       return true;
+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;
 }
-#endif
+
+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<Evoral::MusicalTime>;
 
 } // namespace Evoral