X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=c1d53a25539d9247852e2de6d19f9bc79940e24c;hb=4e1f451520975868659f4c00d00883f5f1cd5805;hp=27910b44f52d82aeba79872bfbf315d7d5753990;hpb=c190aca4a0debe1220558d14afb8f1ab4adb959f;p=ardour.git diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 27910b44f5..c1d53a2553 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1,22 +1,22 @@ /* - Copyright (C) 2007 Paul Davis - Written by Dave Robillard, 2007 + Copyright (C) 2007 Paul Davis + Written by Dave Robillard, 2007 - This program 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. + This program 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. - This program 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 more details. + This program 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 more 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., 675 Mass Ave, Cambridge, MA 02139, USA. + 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + */ #define __STDC_LIMIT_MACROS 1 @@ -24,734 +24,287 @@ #include #include #include +#include #include +#include + #include -#include #include #include #include using namespace std; using namespace ARDOUR; +using namespace PBD; - -// Read iterator (const_iterator) - -MidiModel::const_iterator::const_iterator(const MidiModel& model, double t) - : _model(&model) - , _is_end( (t == DBL_MAX) || model.empty()) - , _locked( ! _is_end) +MidiModel::MidiModel(MidiSource *s, size_t size) + : AutomatableSequence(s->session(), size) + , _midi_source(s) { - //cerr << "Created MIDI iterator @ " << t << "(is end: " << _is_end << ")" << endl; - - if (_is_end) - return; - - model.read_lock(); - - _note_iter = model.notes().end(); - - for (MidiModel::Notes::const_iterator i = model.notes().begin(); i != model.notes().end(); ++i) { - if ((*i).time() >= t) { - _note_iter = i; - break; - } - } - - MidiControlIterator earliest_control = make_pair(boost::shared_ptr(), - make_pair(DBL_MAX, 0.0)); - - _control_iters.reserve(model.controls().size()); - for (Automatable::Controls::const_iterator i = model.controls().begin(); - i != model.controls().end(); ++i) { - - assert(i->first.type() == MidiCCAutomation); - - double x, y; - bool ret = i->second->list()->rt_safe_earliest_event_unlocked(t, DBL_MAX, x, y); - if (!ret) { - cerr << "MIDI Iterator: CC " << i->first.id() << " (size " << i->second->list()->size() - << ") has no events past " << t << endl; - continue; - } - - assert(x >= 0); - assert(y >= 0); - assert(y <= UINT8_MAX); - - const MidiControlIterator new_iter = make_pair(i->second->list(), make_pair(x, y)); - - //cerr << "MIDI Iterator: CC " << i->first.id() << " added (" << x << ", " << y << ")" << endl; - _control_iters.push_back(new_iter); - - if (x < earliest_control.second.first) { - earliest_control = new_iter; - _control_iter = _control_iters.end(); - --_control_iter; - } - } - - if (_note_iter != model.notes().end()) { - _event = MidiEvent(_note_iter->on_event(), false); - ++_note_iter; - } - - if (earliest_control.first && earliest_control.second.first < _event.time()) - model.control_to_midi_event(_event, earliest_control); - else - _control_iter = _control_iters.end(); - - if (_event.size() == 0) { - //cerr << "Created MIDI iterator @ " << t << " is at end." << endl; - _is_end = true; - _model->read_unlock(); - _locked = false; - //} else { - // printf("MIDI Iterator = %X @ %lf\n", _event.type(), _event.time()); - } + cerr << "MidiModel \"" << s->name() << "\" constructed: " << this << endl; } - -MidiModel::const_iterator::~const_iterator() +/** Start a new command. + * + * This has no side-effects on the model or Session, the returned command + * can be held on to for as long as the caller wishes, or discarded without + * formality, until apply_command is called and ownership is taken. + */ +MidiModel::DeltaCommand* MidiModel::new_delta_command(const string name) { - if (_locked) - _model->read_unlock(); + DeltaCommand* cmd = new DeltaCommand(_midi_source->model(), name); + return cmd; } - -const MidiModel::const_iterator& -MidiModel::const_iterator::operator++() +/** Apply a command. + * + * Ownership of cmd is taken, it must not be deleted by the caller. + * The command will constitute one item on the undo stack. + */ +void +MidiModel::apply_command(Session& session, Command* cmd) { - if (_is_end) - throw std::logic_error("Attempt to iterate past end of MidiModel"); - - assert(_event.is_note() || _event.is_cc()); - - // Increment past current control event - if (_control_iter->first && _event.is_cc()) { - double x, y; - const bool ret = _control_iter->first->rt_safe_earliest_event_unlocked( - _control_iter->second.first, DBL_MAX, x, y, false); - - if (ret) { - //cerr << "Incremented " << _control_iter->first->parameter().id() << " to " << x << endl; - _control_iter->second.first = x; - _control_iter->second.second = y; - } else { - //cerr << "Hit end of " << _control_iter->first->parameter().id() << endl; - _control_iter->first.reset(); - _control_iter->second.first = DBL_MAX; - } - } - - // Now find and point at the earliest event - - _control_iter = _control_iters.begin(); - - for (std::vector::iterator i = _control_iters.begin(); - i != _control_iters.end(); ++i) { - if (i->second.first < _control_iter->second.first) { - _control_iter = i; - } - } - - enum Type { NIL, NOTE, CC }; - Type type = NIL; - - if (_note_iter != _model->notes().end()) - type = NOTE; - - if (_control_iter != _control_iters.end() && _control_iter->second.first != DBL_MAX) - if (_note_iter == _model->notes().end() || _control_iter->second.first < _note_iter->time()) - type = CC; - - if (type == NOTE) { - //cerr << "MIDI Iterator = note" << endl; - _event = MidiEvent(_note_iter->on_event(), false); - ++_note_iter; - } else if (type == CC) { - //cerr << "MIDI Iterator = CC" << endl; - _model->control_to_midi_event(_event, *_control_iter); - } else { - //cerr << "MIDI Iterator = NIL" << endl; - _is_end = true; - _model->read_unlock(); - _locked = false; - } - - return *this; + session.begin_reversible_command(cmd->name()); + (*cmd)(); + assert(is_sorted()); + session.commit_reversible_command(cmd); + set_edited(true); } - -bool -MidiModel::const_iterator::operator==(const const_iterator& other) const -{ - if (_is_end) - if (other._is_end) - return true; - else - return false; - else - return (_event == other._event); -} - -// MidiModel - -MidiModel::MidiModel(Session& s, size_t size) - : Automatable(s, "midi model") - , _notes(size) - , _note_mode(Sustained) - , _writing(false) - , _edited(false) - //, _active_notes(LaterNoteEndComparator()) - , _end_iter(*this, DBL_MAX) - , _next_read(UINT32_MAX) - , _read_iter(*this, DBL_MAX) -{ -} +// DeltaCommand - -/** Read events in frame range \a start .. \a start+cnt into \a dst, - * adding \a stamp_offset to each event's timestamp. - * \return number of events written to \a dst - */ -size_t -MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset) const +MidiModel::DeltaCommand::DeltaCommand(boost::shared_ptr m, + const std::string& name) + : Command(name) + , _model(m) + , _name(name) { - size_t read_events = 0; - - if (start != _next_read) { - _read_iter = const_iterator(*this, (double)start); - // cerr << "Repositioning iterator from " << _next_read << " to " << start << endl; - //} else { - // cerr << "Using cached iterator at " << _next_read << endl; - } - - _next_read = start + nframes; - - while (_read_iter != end() && _read_iter->time() < start + nframes) { - dst.write(_read_iter->time() + stamp_offset, _read_iter->size(), _read_iter->buffer()); - ++_read_iter; - ++read_events; - } - -#if 0 - /* FIXME: cache last lookup value to avoid O(n) search every time */ - - if (_note_mode == Sustained) { - - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - - while ( ! _active_notes.empty() ) { - const Note* const earliest_off = _active_notes.top(); - const MidiEvent& off_ev = earliest_off->off_event(); - if (off_ev.time() < start + nframes && off_ev.time() <= n->time()) { - dst.write(off_ev.time() + stamp_offset, off_ev.size(), off_ev.buffer()); - _active_notes.pop(); - ++read_events; - } else { - break; - } - } - - if (n->time() >= start + nframes) - break; - - // Note on - if (n->time() >= start) { - const MidiEvent& on_ev = n->on_event(); - dst.write(on_ev.time() + stamp_offset, on_ev.size(), on_ev.buffer()); - _active_notes.push(&(*n)); - ++read_events; - } - - } - - // Write any trailing note offs - while ( ! _active_notes.empty() ) { - const Note* const earliest_off = _active_notes.top(); - const MidiEvent& off_ev = earliest_off->off_event(); - if (off_ev.time() < start + nframes) { - dst.write(off_ev.time() + stamp_offset, off_ev.size(), off_ev.buffer()); - _active_notes.pop(); - ++read_events; - } else { - break; - } - } - - // Percussive - } else { - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - // Note on - if (n->time() >= start) { - if (n->time() < start + nframes) { - const MidiEvent& ev = n->on_event(); - dst.write(ev.time() + stamp_offset, ev.size(), ev.buffer()); - ++read_events; - } else { - break; - } - } - } - } -#endif - return read_events; } - -bool -MidiModel::control_to_midi_event(MidiEvent& ev, const MidiControlIterator& iter) const +MidiModel::DeltaCommand::DeltaCommand(boost::shared_ptr m, + const XMLNode& node) + : _model(m) { - if (iter.first->parameter().type() == MidiCCAutomation) { - if (ev.size() < 3) - ev.set_buffer((Byte*)malloc(3), true); - - assert(iter.first); - assert(iter.first->parameter().id() <= INT8_MAX); - assert(iter.second.second <= INT8_MAX); - ev.buffer()[0] = MIDI_CMD_CONTROL; - ev.buffer()[1] = (Byte)iter.first->parameter().id(); - ev.buffer()[2] = (Byte)iter.second.second; - ev.time() = iter.second.first; // x - ev.size() = 3; - return true; - } else { - return false; - } + set_state(node); } - -/** Return the earliest MIDI event in the given range. - * - * \return true if \a output has been set to the earliest event in the given range. - */ -#if 0 -bool -MidiModel::earliest_note_event(MidiEvent& output, nframes_t start, nframes_t nframes) const +void +MidiModel::DeltaCommand::add(const boost::shared_ptr note) { - /* FIXME: cache last lookup value to avoid O(n) search every time */ - - const Note* const earliest_on = NULL; - const Note* const earliest_off = NULL; - const MidiEvent* const earliest_cc = NULL; - - /* Notes */ - - if (_note_mode == Sustained) { - - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - - if ( ! _active_notes.empty() ) { - const Note* const earliest_off = _active_notes.top(); - const MidiEvent& off_ev = earliest_off->off_event(); - if (off_ev.time() < start + nframes && off_ev.time() <= n->time()) { - output = off_ev; - //dst.write(off_ev.time() + stamp_offset, off_ev.size(), off_ev.buffer()); - _active_notes.pop(); - return true; - } - } - - if (n->time() >= start + nframes) - break; - - // Note on - if (n->time() >= start) { - earliest_on = &n->on_event(); - //dst.write(on_ev.time() + stamp_offset, on_ev.size(), on_ev.buffer()); - _active_notes.push(&(*n)); - return true; - } - - } - - // Write any trailing note offs - while ( ! _active_notes.empty() ) { - const Note* const earliest_off = _active_notes.top(); - const MidiEvent& off_ev = earliest_off->off_event(); - if (off_ev.time() < start + nframes) { - dst.write(off_ev.time() + stamp_offset, off_ev.size(), off_ev.buffer()); - _active_notes.pop(); - ++read_events; - } else { - break; - } - } - - // Percussive - } else { - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - // Note on - if (n->time() >= start) { - if (n->time() < start + nframes) { - const MidiEvent& ev = n->on_event(); - dst.write(ev.time() + stamp_offset, ev.size(), ev.buffer()); - ++read_events; - } else { - break; - } - } - } - } - - return read_events; + //cerr << "MEC: apply" << endl; + _removed_notes.remove(note); + _added_notes.push_back(note); } -#endif -/** Begin a write of events to the model. - * - * If \a mode is Sustained, complete notes with duration are constructed as note - * on/off events are received. Otherwise (Percussive), only note on events are - * stored; note off events are discarded entirely and all contained notes will - * have duration 0. - */ void -MidiModel::start_write() +MidiModel::DeltaCommand::remove(const boost::shared_ptr note) { - //cerr << "MM " << this << " START WRITE, MODE = " << enum_2_string(_note_mode) << endl; - write_lock(); - _writing = true; - _write_notes.clear(); - write_unlock(); + //cerr << "MEC: remove" << endl; + _added_notes.remove(note); + _removed_notes.push_back(note); } - - -/** Finish a write of events to the model. - * - * If \a delete_stuck is true and the current mode is Sustained, note on events - * that were never resolved with a corresonding note off will be deleted. - * Otherwise they will remain as notes with duration 0. - */ void -MidiModel::end_write(bool delete_stuck) +MidiModel::DeltaCommand::operator()() { - write_lock(); - assert(_writing); + // This could be made much faster by using a priority_queue for added and + // removed notes (or sort here), and doing a single iteration over _model - //cerr << "MM " << this << " END WRITE: " << _notes.size() << " NOTES\n"; - - if (_note_mode == Sustained && delete_stuck) { - for (Notes::iterator n = _notes.begin(); n != _notes.end() ; ) { - if (n->duration() == 0) { - cerr << "WARNING: Stuck note lost: " << n->note() << endl; - n = _notes.erase(n); - } else { - ++n; - } - } - } + _model->write_lock(); - _write_notes.clear(); - _writing = false; - write_unlock(); -} + // Store the current seek position so we can restore the read iterator + // after modifying the contents of the model + const double read_time = _model->read_time(); + for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) + _model->add_note_unlocked(*i); -/** Append contents of \a buf 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. - * - * Events in buf are deep copied. - */ -void -MidiModel::append(const MidiBuffer& buf) -{ - write_lock(); + for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) + _model->remove_note_unlocked(*i); - assert(_writing); + _model->write_unlock(); + // FIXME: race? + _model->read_seek(read_time); // restore read position - for (MidiBuffer::const_iterator i = buf.begin(); i != buf.end(); ++i) { - assert(_notes.empty() || (*i).time() >= _notes.back().time()); - append(*i); - } - - write_unlock(); + _model->ContentsChanged(); /* EMIT SIGNAL */ } - -/** Append \a in_event 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. - */ void -MidiModel::append(const MidiEvent& ev) +MidiModel::DeltaCommand::undo() { - write_lock(); - - assert(_notes.empty() || ev.time() >= _notes.back().time()); - assert(_writing); - - if (ev.is_note_on()) - append_note_on_unlocked(ev.time(), ev.note(), ev.velocity()); - else if (ev.is_note_off()) - append_note_off_unlocked(ev.time(), ev.note()); - else if (ev.is_cc()) - append_cc_unlocked(ev.time(), ev.cc_number(), ev.cc_value()); - else - printf("MM Unknown event type %X\n", ev.type()); + // This could be made much faster by using a priority_queue for added and + // removed notes (or sort here), and doing a single iteration over _model - write_unlock(); -} + _model->write_lock(); + // Store the current seek position so we can restore the read iterator + // after modifying the contents of the model + const double read_time = _model->read_time(); -void -MidiModel::append_note_on_unlocked(double time, uint8_t note_num, uint8_t velocity) -{ - //cerr << "MidiModel " << this << " note " << (int)note_num << " on @ " << time << endl; + for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) + _model->remove_note_unlocked(*i); - assert(_writing); - _notes.push_back(Note(time, 0, note_num, velocity)); - if (_note_mode == Sustained) { - //cerr << "MM Sustained: Appending active note on " << (unsigned)(uint8_t)note_num << endl; - _write_notes.push_back(_notes.size() - 1); - } else { - //cerr << "MM Percussive: NOT appending active note on" << endl; - } -} + for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) + _model->add_note_unlocked(*i); + _model->write_unlock(); + // FIXME: race? + _model->read_seek(read_time); // restore read position -void -MidiModel::append_note_off_unlocked(double time, uint8_t note_num) -{ - //cerr << "MidiModel " << this << " note " << (int)note_num << " off @ " << time << endl; - - assert(_writing); - if (_note_mode == Percussive) { - //cerr << "MM Ignoring note off (percussive mode)" << endl; - return; - } else { - //cerr << "MM Attempting to resolve note off " << (unsigned)(uint8_t)note_num << endl; - } - - /* FIXME: make _write_notes fixed size (127 noted) for speed */ - - /* FIXME: note off velocity for that one guy out there who actually has - * keys that send it */ - - for (WriteNotes::iterator n = _write_notes.begin(); n != _write_notes.end(); ++n) { - Note& note = _notes[*n]; - //cerr << (unsigned)(uint8_t)note.note() << " ? " << (unsigned)note_num << endl; - if (note.note() == note_num) { - assert(time > note.time()); - note.set_duration(time - note.time()); - _write_notes.erase(n); - //cerr << "MM resolved note, duration: " << note.duration() << endl; - break; - } - } + _model->ContentsChanged(); /* EMIT SIGNAL */ } - -void -MidiModel::append_cc_unlocked(double time, uint8_t number, uint8_t value) +XMLNode& +MidiModel::DeltaCommand::marshal_note(const boost::shared_ptr note) { - Parameter param(MidiCCAutomation, number); - - boost::shared_ptr control = Automatable::control(param, true); - //cerr << "MidiModel " << this << "(" << control.get() << ") add CC " << (int)number << " = " << (int)value - // << " @ " << time << endl; - control->list()->fast_simple_add(time, (double)value); -} + XMLNode *xml_note = new XMLNode("note"); + ostringstream note_str(ios::ate); + note_str << int(note->note()); + xml_note->add_property("note", note_str.str()); + ostringstream channel_str(ios::ate); + channel_str << int(note->channel()); + xml_note->add_property("channel", channel_str.str()); -void -MidiModel::add_note_unlocked(const Note& note) -{ - //cerr << "MidiModel " << this << " add note " << (int)note.note() << " @ " << note.time() << endl; - Notes::iterator i = upper_bound(_notes.begin(), _notes.end(), note, note_time_comparator); - _notes.insert(i, note); -} + ostringstream time_str(ios::ate); + time_str << int(note->time()); + xml_note->add_property("time", time_str.str()); + ostringstream length_str(ios::ate); + length_str <<(unsigned int) note->length(); + xml_note->add_property("length", length_str.str()); -void -MidiModel::remove_note_unlocked(const Note& note) -{ - //cerr << "MidiModel " << this << " remove note " << (int)note.note() << " @ " << note.time() << endl; - Notes::iterator n = find(_notes.begin(), _notes.end(), note); - if (n != _notes.end()) - _notes.erase(n); -} - -/** Slow! for debugging only. */ -#ifndef NDEBUG -bool -MidiModel::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(); - - return true; -} -#endif + ostringstream velocity_str(ios::ate); + velocity_str << (unsigned int) note->velocity(); + xml_note->add_property("velocity", velocity_str.str()); -/** Start a new command. - * - * This has no side-effects on the model or Session, the returned command - * can be held on to for as long as the caller wishes, or discarded without - * formality, until apply_command is called and ownership is taken. - */ -MidiModel::DeltaCommand* -MidiModel::new_delta_command(const string name) -{ - DeltaCommand* cmd = new DeltaCommand(*this, name); - return cmd; + return *xml_note; } - -/** Apply a command. - * - * Ownership of cmd is taken, it must not be deleted by the caller. - * The command will constitute one item on the undo stack. - */ -void -MidiModel::apply_command(Command* cmd) +boost::shared_ptr MidiModel::DeltaCommand::unmarshal_note(XMLNode *xml_note) { - _session.begin_reversible_command(cmd->name()); - (*cmd)(); - assert(is_sorted()); - _session.commit_reversible_command(cmd); - _edited = true; -} + unsigned int note; + XMLProperty* prop; + unsigned int channel; + unsigned int time; + unsigned int length; + unsigned int velocity; + + if ((prop = xml_note->property("note")) != 0) { + istringstream note_str(prop->value()); + note_str >> note; + } else { + warning << "note information missing note value" << endmsg; + note = 127; + } + if ((prop = xml_note->property("channel")) != 0) { + istringstream channel_str(prop->value()); + channel_str >> channel; + } else { + warning << "note information missing channel" << endmsg; + channel = 0; + } -// MidiEditCommand + if ((prop = xml_note->property("time")) != 0) { + istringstream time_str(prop->value()); + time_str >> time; + } else { + warning << "note information missing time" << endmsg; + time = 0; + } + if ((prop = xml_note->property("length")) != 0) { + istringstream length_str(prop->value()); + length_str >> length; + } else { + warning << "note information missing length" << endmsg; + note = 1; + } -void -MidiModel::DeltaCommand::add(const Note& note) -{ - //cerr << "MEC: apply" << endl; + if ((prop = xml_note->property("velocity")) != 0) { + istringstream velocity_str(prop->value()); + velocity_str >> velocity; + } else { + warning << "note information missing velocity" << endmsg; + velocity = 127; + } - _removed_notes.remove(note); - _added_notes.push_back(note); + boost::shared_ptr note_ptr(new Evoral::Note(channel, time, length, note, velocity)); + return note_ptr; } +#define ADDED_NOTES_ELEMENT "added_notes" +#define REMOVED_NOTES_ELEMENT "removed_notes" +#define DELTA_COMMAND_ELEMENT "DeltaCommand" -void -MidiModel::DeltaCommand::remove(const Note& note) +int MidiModel::DeltaCommand::set_state(const XMLNode& delta_command) { - //cerr << "MEC: remove" << endl; + if (delta_command.name() != string(DELTA_COMMAND_ELEMENT)) { + return 1; + } - _added_notes.remove(note); - _removed_notes.push_back(note); + _added_notes.clear(); + XMLNode *added_notes = delta_command.child(ADDED_NOTES_ELEMENT); + XMLNodeList notes = added_notes->children(); + transform(notes.begin(), notes.end(), back_inserter(_added_notes), + sigc::mem_fun(*this, &DeltaCommand::unmarshal_note)); + + _removed_notes.clear(); + XMLNode *removed_notes = delta_command.child(REMOVED_NOTES_ELEMENT); + notes = removed_notes->children(); + transform(notes.begin(), notes.end(), back_inserter(_removed_notes), + sigc::mem_fun(*this, &DeltaCommand::unmarshal_note)); + + return 0; } - -void -MidiModel::DeltaCommand::operator()() +XMLNode& MidiModel::DeltaCommand::get_state() { - // This could be made much faster by using a priority_queue for added and - // removed notes (or sort here), and doing a single iteration over _model - - _model.write_lock(); - - for (std::list::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) - _model.add_note_unlocked(*i); - - for (std::list::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) - _model.remove_note_unlocked(*i); - - _model.write_unlock(); - - _model.ContentsChanged(); /* EMIT SIGNAL */ -} + XMLNode *delta_command = new XMLNode(DELTA_COMMAND_ELEMENT); + delta_command->add_property("midi-source", _model->midi_source()->id().to_s()); + XMLNode *added_notes = delta_command->add_child(ADDED_NOTES_ELEMENT); + for_each(_added_notes.begin(), _added_notes.end(), sigc::compose( + sigc::mem_fun(*added_notes, &XMLNode::add_child_nocopy), + sigc::mem_fun(*this, &DeltaCommand::marshal_note))); -void -MidiModel::DeltaCommand::undo() -{ - // This could be made much faster by using a priority_queue for added and - // removed notes (or sort here), and doing a single iteration over _model - - _model.write_lock(); + XMLNode *removed_notes = delta_command->add_child(REMOVED_NOTES_ELEMENT); + for_each(_removed_notes.begin(), _removed_notes.end(), sigc::compose( + sigc::mem_fun(*removed_notes, &XMLNode::add_child_nocopy), + sigc::mem_fun(*this, &DeltaCommand::marshal_note))); - for (std::list::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) - _model.remove_note_unlocked(*i); - - for (std::list::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) - _model.add_note_unlocked(*i); - - _model.write_unlock(); - - _model.ContentsChanged(); /* EMIT SIGNAL */ + return *delta_command; } - -bool -MidiModel::write_to(boost::shared_ptr source) +/** Write the model to a MidiSource (i.e. save the model). + * This is different from manually using read to write to a source in that + * note off events are written regardless of the track mode. This is so the + * user can switch a recorded track (with note durations from some instrument) + * to percussive, save, reload, then switch it back to sustained without + * destroying the original note durations. + */ +bool MidiModel::write_to(boost::shared_ptr source) { - //cerr << "Writing model to " << source->name() << endl; - - /* This could be done using a temporary MidiRingBuffer and using - * MidiModel::read and MidiSource::write, but this is more efficient - * and doesn't require any buffer size assumptions (ie it's worth - * the code duplication). - * - * This is also different from read in that note off events are written - * regardless of the track mode. This is so the user can switch a - * recorded track (with note durations from some instrument) to percussive, - * save, reload, then switch it back to sustained preserving the original - * note durations. - */ - - /* Percussive - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - const MidiEvent& ev = n->on_event(); - source->append_event_unlocked(ev); - }*/ - read_lock(); - LaterNoteEndComparator cmp; - ActiveNotes active_notes(cmp); - - // Foreach note - for (Notes::const_iterator n = _notes.begin(); n != _notes.end(); ++n) { - - // Write any pending note offs earlier than this note on - while ( ! active_notes.empty() ) { - const Note* const earliest_off = active_notes.top(); - const MidiEvent& off_ev = earliest_off->off_event(); - if (off_ev.time() <= n->time()) { - source->append_event_unlocked(off_ev); - active_notes.pop(); - } else { - break; - } - } - - // Write this note on - source->append_event_unlocked(n->on_event()); - if (n->duration() > 0) - active_notes.push(&(*n)); + const bool old_percussive = percussive(); + set_percussive(false); + + for (Evoral::Sequence::const_iterator i = begin(); i != end(); ++i) { + source->append_event_unlocked(Frames, *i); } - // Write any trailing note offs - while ( ! active_notes.empty() ) { - source->append_event_unlocked(active_notes.top()->off_event()); - active_notes.pop(); - } - - _edited = false; + set_percussive(old_percussive); read_unlock(); + set_edited(false); return true; } -XMLNode& -MidiModel::get_state() +XMLNode& MidiModel::get_state() { XMLNode *node = new XMLNode("MidiModel"); return *node;