From f6ed36a457aace0c4f0c542014d8a3fc65c7a852 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 20 Dec 2010 22:51:17 +0000 Subject: Fix more broken whitespace. git-svn-id: svn://localhost/ardour2/branches/3.0@8314 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/beats_frames_converter.h | 10 +- libs/ardour/ardour/midi_region.h | 44 +- libs/ardour/ardour/midi_source.h | 3 +- libs/ardour/beats_frames_converter.cc | 4 +- libs/ardour/midi_model.cc | 1694 +++++++++++++-------------- libs/ardour/midi_region.cc | 88 +- libs/ardour/midi_source.cc | 110 +- libs/ardour/midi_state_tracker.cc | 19 +- libs/ardour/smf_source.cc | 134 +-- 9 files changed, 1053 insertions(+), 1053 deletions(-) diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index 286c4aaa6a..46d6f03501 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -35,12 +35,12 @@ class TempoMap; */ class BeatsFramesConverter : public Evoral::TimeConverter { public: - BeatsFramesConverter (const TempoMap& tempo_map, framepos_t origin) - : Evoral::TimeConverter (origin) - , _tempo_map(tempo_map) - {} + BeatsFramesConverter (const TempoMap& tempo_map, framepos_t origin) + : Evoral::TimeConverter (origin) + , _tempo_map(tempo_map) + {} - framepos_t to (double beats) const; + framepos_t to (double beats) const; double from (framepos_t frames) const; private: diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 650c7c9b2e..f5886698d5 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -62,7 +62,7 @@ class MidiRegion : public Region ~MidiRegion(); - boost::shared_ptr clone (); + boost::shared_ptr clone (); boost::shared_ptr midi_source (uint32_t n=0) const; @@ -71,17 +71,17 @@ class MidiRegion : public Region virtual framecnt_t readable_length() const { return length(); } framecnt_t read_at (Evoral::EventSink& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained, - MidiStateTracker* tracker = 0) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained, + MidiStateTracker* tracker = 0) const; framepos_t master_read_at (MidiRingBuffer& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained) const; XMLNode& state (); int set_state (const XMLNode&, int version); @@ -117,38 +117,38 @@ class MidiRegion : public Region private: friend class RegionFactory; - PBD::Property _length_beats; + PBD::Property _length_beats; MidiRegion (const SourceList&); MidiRegion (boost::shared_ptr, frameoffset_t offset = 0, bool offset_relative = true); framecnt_t _read_at (const SourceList&, Evoral::EventSink& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained, - MidiStateTracker* tracker = 0) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained, + MidiStateTracker* tracker = 0) const; void register_properties (); - void post_set (const PBD::PropertyChange&); + void post_set (const PBD::PropertyChange&); void recompute_at_start (); void recompute_at_end (); void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - void set_length_internal (framecnt_t len); - void update_length_beats (); + void set_length_internal (framecnt_t len); + void update_length_beats (); void model_changed (); void model_automation_state_changed (Evoral::Parameter const &); - void model_contents_changed (); + void model_contents_changed (); std::set _filtered_parameters; ///< parameters that we ask our source not to return when reading PBD::ScopedConnection _model_connection; PBD::ScopedConnection _source_connection; - PBD::ScopedConnection _model_contents_connection; + PBD::ScopedConnection _model_contents_connection; - double _last_length_beats; + double _last_length_beats; }; } /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 33a0c3c1fa..f13b71e0f1 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -96,6 +96,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this< int set_state (const XMLNode&, int version); bool length_mutable() const { return true; } + double length_beats() const { return _length_beats; } virtual void load_model(bool lock=true, bool force_reload=false) = 0; virtual void destroy_model() = 0; @@ -150,7 +151,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this< mutable Evoral::Sequence::const_iterator _model_iter; mutable bool _model_iter_valid; - mutable double _length_beats; + mutable double _length_beats; mutable framepos_t _last_read_end; framepos_t _last_write_end; diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index 69610aecd3..7ee8fbd090 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -27,13 +27,13 @@ namespace ARDOUR { framecnt_t BeatsFramesConverter::to (double beats) const { - return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats)) - _origin_b; + return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats)) - _origin_b; } double BeatsFramesConverter::from (framecnt_t frames) const { - return _tempo_map.framewalk_to_beats (_origin_b, frames); + return _tempo_map.framewalk_to_beats (_origin_b, frames); } } /* namespace ARDOUR */ diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index be8e97b055..e185300cca 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1,20 +1,20 @@ /* - Copyright (C) 2007 Paul Davis - Author: Dave Robillard + Copyright (C) 2007 Paul Davis + Author: Dave Robillard - 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. */ @@ -145,172 +145,172 @@ MidiModel::NoteDiffCommand::side_effect_remove (const NotePtr note) void MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, - uint8_t new_value) + uint8_t new_value) { assert (note); - NoteChange change; + NoteChange change; - switch (prop) { - case NoteNumber: - if (new_value == note->note()) { - return; - } - change.old_value = note->note(); - break; - case Velocity: - if (new_value == note->velocity()) { - return; - } - change.old_value = note->velocity(); - break; - case Channel: - if (new_value == note->channel()) { - return; - } - change.old_value = note->channel(); - break; - - - case StartTime: - fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg; - /*NOTREACHED*/ - break; - case Length: - fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg; - /*NOTREACHED*/ - break; - } - - change.note = note; - change.property = prop; - change.new_value = new_value; - - _changes.push_back (change); + switch (prop) { + case NoteNumber: + if (new_value == note->note()) { + return; + } + change.old_value = note->note(); + break; + case Velocity: + if (new_value == note->velocity()) { + return; + } + change.old_value = note->velocity(); + break; + case Channel: + if (new_value == note->channel()) { + return; + } + change.old_value = note->channel(); + break; + + + case StartTime: + fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg; + /*NOTREACHED*/ + break; + case Length: + fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg; + /*NOTREACHED*/ + break; + } + + change.note = note; + change.property = prop; + change.new_value = new_value; + + _changes.push_back (change); } void MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop, - TimeType new_time) + TimeType new_time) { assert (note); - NoteChange change; - - switch (prop) { - case NoteNumber: - case Channel: - case Velocity: - fatal << "MidiModel::NoteDiffCommand::change() with time argument called for note, channel or velocity" << endmsg; - break; - - case StartTime: - if (Evoral::musical_time_equal (note->time(), new_time)) { - return; - } - change.old_time = note->time(); - break; - case Length: - if (Evoral::musical_time_equal (note->length(), new_time)) { - return; - } - change.old_time = note->length(); - break; - } - - change.note = note; - change.property = prop; - change.new_time = new_time; - - _changes.push_back (change); + NoteChange change; + + switch (prop) { + case NoteNumber: + case Channel: + case Velocity: + fatal << "MidiModel::NoteDiffCommand::change() with time argument called for note, channel or velocity" << endmsg; + break; + + case StartTime: + if (Evoral::musical_time_equal (note->time(), new_time)) { + return; + } + change.old_time = note->time(); + break; + case Length: + if (Evoral::musical_time_equal (note->length(), new_time)) { + return; + } + change.old_time = note->length(); + break; + } + + change.note = note; + change.property = prop; + change.new_time = new_time; + + _changes.push_back (change); } MidiModel::NoteDiffCommand & MidiModel::NoteDiffCommand::operator+= (const NoteDiffCommand& other) { - if (this == &other) { - return *this; - } + if (this == &other) { + return *this; + } - if (_model != other._model) { - return *this; - } + if (_model != other._model) { + return *this; + } - _added_notes.insert (_added_notes.end(), other._added_notes.begin(), other._added_notes.end()); - _removed_notes.insert (_removed_notes.end(), other._removed_notes.begin(), other._removed_notes.end()); - side_effect_removals.insert (other.side_effect_removals.begin(), other.side_effect_removals.end()); - _changes.insert (_changes.end(), other._changes.begin(), other._changes.end()); + _added_notes.insert (_added_notes.end(), other._added_notes.begin(), other._added_notes.end()); + _removed_notes.insert (_removed_notes.end(), other._removed_notes.begin(), other._removed_notes.end()); + side_effect_removals.insert (other.side_effect_removals.begin(), other.side_effect_removals.end()); + _changes.insert (_changes.end(), other._changes.begin(), other._changes.end()); - return *this; + return *this; } void MidiModel::NoteDiffCommand::operator() () { - { - MidiModel::WriteLock lock(_model->edit_lock()); - - for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) { - if (!_model->add_note_unlocked(*i)) { - /* failed to add it, so don't leave it in the removed list, to - avoid apparent errors on undo. - */ - _removed_notes.remove (*i); - } - } - - for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { - _model->remove_note_unlocked(*i); - } - - /* notes we modify in a way that requires remove-then-add to maintain ordering */ - set temporary_removals; - - for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { - Property prop = i->property; - switch (prop) { - case NoteNumber: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - } - i->note->set_note (i->new_value); - break; - - case StartTime: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - - } - i->note->set_time (i->new_time); - break; - - case Channel: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - } - i->note->set_channel (i->new_value); - break; - - /* no remove-then-add required for these properties, since we do not index them - */ - - case Velocity: - i->note->set_velocity (i->new_value); - break; - - case Length: - i->note->set_length (i->new_time); - break; - - } - } - - - for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { - NoteDiffCommand side_effects (model(), "side effects"); + { + MidiModel::WriteLock lock(_model->edit_lock()); + + for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) { + if (!_model->add_note_unlocked(*i)) { + /* failed to add it, so don't leave it in the removed list, to + avoid apparent errors on undo. + */ + _removed_notes.remove (*i); + } + } + + for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { + _model->remove_note_unlocked(*i); + } + + /* notes we modify in a way that requires remove-then-add to maintain ordering */ + set temporary_removals; + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + Property prop = i->property; + switch (prop) { + case NoteNumber: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + } + i->note->set_note (i->new_value); + break; + + case StartTime: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + + } + i->note->set_time (i->new_time); + break; + + case Channel: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + } + i->note->set_channel (i->new_value); + break; + + /* no remove-then-add required for these properties, since we do not index them + */ + + case Velocity: + i->note->set_velocity (i->new_value); + break; + + case Length: + i->note->set_length (i->new_time); + break; + + } + } + + + for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { + NoteDiffCommand side_effects (model(), "side effects"); if (_model->add_note_unlocked (*i, &side_effects)) { /* The note was re-added ok */ *this += side_effects; @@ -335,387 +335,387 @@ MidiModel::NoteDiffCommand::operator() () /* ...in fact, we removed it */ _removed_notes.push_back (*i); } - } + } - if (!side_effect_removals.empty()) { - cerr << "SER: \n"; - for (set::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) { - cerr << "\t" << *i << ' ' << **i << endl; - } - } - } + if (!side_effect_removals.empty()) { + cerr << "SER: \n"; + for (set::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) { + cerr << "\t" << *i << ' ' << **i << endl; + } + } + } - _model->ContentsChanged(); /* EMIT SIGNAL */ + _model->ContentsChanged(); /* EMIT SIGNAL */ } void MidiModel::NoteDiffCommand::undo () { - { - MidiModel::WriteLock lock(_model->edit_lock()); - - for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) { - _model->remove_note_unlocked(*i); - } - - for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { - _model->add_note_unlocked(*i); - } - - /* notes we modify in a way that requires remove-then-add to maintain ordering */ - set temporary_removals; - - for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { - Property prop = i->property; - switch (prop) { - case NoteNumber: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - } - i->note->set_note (i->old_value); - break; - case Velocity: - i->note->set_velocity (i->old_value); - break; - case StartTime: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - } - i->note->set_time (i->old_time); - break; - case Length: - i->note->set_length (i->old_time); - break; - case Channel: - if (temporary_removals.find (i->note) == temporary_removals.end()) { - _model->remove_note_unlocked (i->note); - temporary_removals.insert (i->note); - } - i->note->set_channel (i->old_value); - break; - } - } - - for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { - _model->add_note_unlocked (*i); - } - - /* finally add back notes that were removed by the "do". we don't care - about side effects here since the model should be back to its original - state once this is done. - */ - - for (set::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) { - _model->add_note_unlocked (*i); - } - } - - _model->ContentsChanged(); /* EMIT SIGNAL */ + { + MidiModel::WriteLock lock(_model->edit_lock()); + + for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) { + _model->remove_note_unlocked(*i); + } + + for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) { + _model->add_note_unlocked(*i); + } + + /* notes we modify in a way that requires remove-then-add to maintain ordering */ + set temporary_removals; + + for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) { + Property prop = i->property; + switch (prop) { + case NoteNumber: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + } + i->note->set_note (i->old_value); + break; + case Velocity: + i->note->set_velocity (i->old_value); + break; + case StartTime: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + } + i->note->set_time (i->old_time); + break; + case Length: + i->note->set_length (i->old_time); + break; + case Channel: + if (temporary_removals.find (i->note) == temporary_removals.end()) { + _model->remove_note_unlocked (i->note); + temporary_removals.insert (i->note); + } + i->note->set_channel (i->old_value); + break; + } + } + + for (set::iterator i = temporary_removals.begin(); i != temporary_removals.end(); ++i) { + _model->add_note_unlocked (*i); + } + + /* finally add back notes that were removed by the "do". we don't care + about side effects here since the model should be back to its original + state once this is done. + */ + + for (set::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) { + _model->add_note_unlocked (*i); + } + } + + _model->ContentsChanged(); /* EMIT SIGNAL */ } XMLNode& MidiModel::NoteDiffCommand::marshal_note(const NotePtr note) { - XMLNode* xml_note = new XMLNode("note"); - - { - ostringstream id_str(ios::ate); - id_str << int(note->id()); - xml_note->add_property("id", id_str.str()); - } - - { - 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()); - } - - { - ostringstream time_str(ios::ate); - time_str << note->time(); - xml_note->add_property("time", time_str.str()); - } - - { - ostringstream length_str(ios::ate); - length_str << note->length(); - xml_note->add_property("length", length_str.str()); - } - - { - ostringstream velocity_str(ios::ate); - velocity_str << (unsigned int) note->velocity(); - xml_note->add_property("velocity", velocity_str.str()); - } - - return *xml_note; + XMLNode* xml_note = new XMLNode("note"); + + { + ostringstream id_str(ios::ate); + id_str << int(note->id()); + xml_note->add_property("id", id_str.str()); + } + + { + 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()); + } + + { + ostringstream time_str(ios::ate); + time_str << note->time(); + xml_note->add_property("time", time_str.str()); + } + + { + ostringstream length_str(ios::ate); + length_str << note->length(); + xml_note->add_property("length", length_str.str()); + } + + { + ostringstream velocity_str(ios::ate); + velocity_str << (unsigned int) note->velocity(); + xml_note->add_property("velocity", velocity_str.str()); + } + + return *xml_note; } Evoral::Sequence::NotePtr MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note) { - unsigned int note; - XMLProperty* prop; - unsigned int channel; - unsigned int time; - unsigned int length; - unsigned int velocity; - gint id; - - if ((prop = xml_note->property("id")) != 0) { - istringstream id_str(prop->value()); - id_str >> id; - } else { - error << "note information missing ID value" << endmsg; - id = -1; - } - - 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; - } - - 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; - length = 1; - } - - if ((prop = xml_note->property("velocity")) != 0) { - istringstream velocity_str(prop->value()); - velocity_str >> velocity; - } else { - warning << "note information missing velocity" << endmsg; - velocity = 127; - } - - NotePtr note_ptr(new Evoral::Note(channel, time, length, note, velocity)); - note_ptr->set_id (id); - - return note_ptr; + unsigned int note; + XMLProperty* prop; + unsigned int channel; + unsigned int time; + unsigned int length; + unsigned int velocity; + gint id; + + if ((prop = xml_note->property("id")) != 0) { + istringstream id_str(prop->value()); + id_str >> id; + } else { + error << "note information missing ID value" << endmsg; + id = -1; + } + + 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; + } + + 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; + length = 1; + } + + if ((prop = xml_note->property("velocity")) != 0) { + istringstream velocity_str(prop->value()); + velocity_str >> velocity; + } else { + warning << "note information missing velocity" << endmsg; + velocity = 127; + } + + NotePtr note_ptr(new Evoral::Note(channel, time, length, note, velocity)); + note_ptr->set_id (id); + + return note_ptr; } XMLNode& MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change) { - XMLNode* xml_change = new XMLNode("Change"); - - /* first, the change itself */ - - xml_change->add_property ("property", enum_2_string (change.property)); - - { - ostringstream old_value_str (ios::ate); - if (change.property == StartTime || change.property == Length) { - old_value_str << change.old_time; - } else { - old_value_str << (unsigned int) change.old_value; - } - xml_change->add_property ("old", old_value_str.str()); - } - - { - ostringstream new_value_str (ios::ate); - if (change.property == StartTime || change.property == Length) { - new_value_str << change.new_time; - } else { - new_value_str << (unsigned int) change.new_value; - } - xml_change->add_property ("new", new_value_str.str()); - } - - ostringstream id_str; - id_str << change.note->id(); - xml_change->add_property ("id", id_str.str()); - - return *xml_change; + XMLNode* xml_change = new XMLNode("Change"); + + /* first, the change itself */ + + xml_change->add_property ("property", enum_2_string (change.property)); + + { + ostringstream old_value_str (ios::ate); + if (change.property == StartTime || change.property == Length) { + old_value_str << change.old_time; + } else { + old_value_str << (unsigned int) change.old_value; + } + xml_change->add_property ("old", old_value_str.str()); + } + + { + ostringstream new_value_str (ios::ate); + if (change.property == StartTime || change.property == Length) { + new_value_str << change.new_time; + } else { + new_value_str << (unsigned int) change.new_value; + } + xml_change->add_property ("new", new_value_str.str()); + } + + ostringstream id_str; + id_str << change.note->id(); + xml_change->add_property ("id", id_str.str()); + + return *xml_change; } MidiModel::NoteDiffCommand::NoteChange MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; - NoteChange change; - - if ((prop = xml_change->property("property")) != 0) { - change.property = (Property) string_2_enum (prop->value(), change.property); - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } - - if ((prop = xml_change->property ("id")) == 0) { - error << _("No NoteID found for note property change - ignored") << endmsg; - return change; - } - - gint note_id = atoi (prop->value().c_str()); - - if ((prop = xml_change->property ("old")) != 0) { - istringstream old_str (prop->value()); - if (change.property == StartTime || change.property == Length) { - old_str >> change.old_time; - } else { - int integer_value_so_that_istream_does_the_right_thing; - old_str >> integer_value_so_that_istream_does_the_right_thing; - change.old_value = integer_value_so_that_istream_does_the_right_thing; - } - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } - - if ((prop = xml_change->property ("new")) != 0) { - istringstream new_str (prop->value()); - if (change.property == StartTime || change.property == Length) { - new_str >> change.new_time; - } else { - int integer_value_so_that_istream_does_the_right_thing; - new_str >> integer_value_so_that_istream_does_the_right_thing; - change.new_value = integer_value_so_that_istream_does_the_right_thing; - } - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } - - /* we must point at the instance of the note that is actually in the model. - so go look for it ... - */ - - change.note = _model->find_note (note_id); - - if (!change.note) { - warning << "MIDI note #" << note_id << " not found in model - programmers should investigate this" << endmsg; - return change; - } - - return change; + XMLProperty* prop; + NoteChange change; + + if ((prop = xml_change->property("property")) != 0) { + change.property = (Property) string_2_enum (prop->value(), change.property); + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } + + if ((prop = xml_change->property ("id")) == 0) { + error << _("No NoteID found for note property change - ignored") << endmsg; + return change; + } + + gint note_id = atoi (prop->value().c_str()); + + if ((prop = xml_change->property ("old")) != 0) { + istringstream old_str (prop->value()); + if (change.property == StartTime || change.property == Length) { + old_str >> change.old_time; + } else { + int integer_value_so_that_istream_does_the_right_thing; + old_str >> integer_value_so_that_istream_does_the_right_thing; + change.old_value = integer_value_so_that_istream_does_the_right_thing; + } + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } + + if ((prop = xml_change->property ("new")) != 0) { + istringstream new_str (prop->value()); + if (change.property == StartTime || change.property == Length) { + new_str >> change.new_time; + } else { + int integer_value_so_that_istream_does_the_right_thing; + new_str >> integer_value_so_that_istream_does_the_right_thing; + change.new_value = integer_value_so_that_istream_does_the_right_thing; + } + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } + + /* we must point at the instance of the note that is actually in the model. + so go look for it ... + */ + + change.note = _model->find_note (note_id); + + if (!change.note) { + warning << "MIDI note #" << note_id << " not found in model - programmers should investigate this" << endmsg; + return change; + } + + return change; } int MidiModel::NoteDiffCommand::set_state (const XMLNode& diff_command, int /*version*/) { - if (diff_command.name() != string (NOTE_DIFF_COMMAND_ELEMENT)) { - return 1; - } + if (diff_command.name() != string (NOTE_DIFF_COMMAND_ELEMENT)) { + return 1; + } - /* additions */ + /* additions */ - _added_notes.clear(); - XMLNode* added_notes = diff_command.child(ADDED_NOTES_ELEMENT); - if (added_notes) { - XMLNodeList notes = added_notes->children(); - transform(notes.begin(), notes.end(), back_inserter(_added_notes), - boost::bind (&NoteDiffCommand::unmarshal_note, this, _1)); - } + _added_notes.clear(); + XMLNode* added_notes = diff_command.child(ADDED_NOTES_ELEMENT); + if (added_notes) { + XMLNodeList notes = added_notes->children(); + transform(notes.begin(), notes.end(), back_inserter(_added_notes), + boost::bind (&NoteDiffCommand::unmarshal_note, this, _1)); + } - /* removals */ + /* removals */ - _removed_notes.clear(); - XMLNode* removed_notes = diff_command.child(REMOVED_NOTES_ELEMENT); - if (removed_notes) { - XMLNodeList notes = removed_notes->children(); - transform(notes.begin(), notes.end(), back_inserter(_removed_notes), - boost::bind (&NoteDiffCommand::unmarshal_note, this, _1)); - } + _removed_notes.clear(); + XMLNode* removed_notes = diff_command.child(REMOVED_NOTES_ELEMENT); + if (removed_notes) { + XMLNodeList notes = removed_notes->children(); + transform(notes.begin(), notes.end(), back_inserter(_removed_notes), + boost::bind (&NoteDiffCommand::unmarshal_note, this, _1)); + } - /* changes */ + /* changes */ - _changes.clear(); + _changes.clear(); - XMLNode* changed_notes = diff_command.child(DIFF_NOTES_ELEMENT); + XMLNode* changed_notes = diff_command.child(DIFF_NOTES_ELEMENT); - if (changed_notes) { - XMLNodeList notes = changed_notes->children(); - transform (notes.begin(), notes.end(), back_inserter(_changes), - boost::bind (&NoteDiffCommand::unmarshal_change, this, _1)); + if (changed_notes) { + XMLNodeList notes = changed_notes->children(); + transform (notes.begin(), notes.end(), back_inserter(_changes), + boost::bind (&NoteDiffCommand::unmarshal_change, this, _1)); - } + } - /* side effect removals caused by changes */ + /* side effect removals caused by changes */ - side_effect_removals.clear(); + side_effect_removals.clear(); - XMLNode* side_effect_notes = diff_command.child(SIDE_EFFECT_REMOVALS_ELEMENT); + XMLNode* side_effect_notes = diff_command.child(SIDE_EFFECT_REMOVALS_ELEMENT); - if (side_effect_notes) { - XMLNodeList notes = side_effect_notes->children(); - for (XMLNodeList::iterator n = notes.begin(); n != notes.end(); ++n) { - side_effect_removals.insert (unmarshal_note (*n)); - } - } + if (side_effect_notes) { + XMLNodeList notes = side_effect_notes->children(); + for (XMLNodeList::iterator n = notes.begin(); n != notes.end(); ++n) { + side_effect_removals.insert (unmarshal_note (*n)); + } + } - return 0; + return 0; } XMLNode& MidiModel::NoteDiffCommand::get_state () { - XMLNode* diff_command = new XMLNode (NOTE_DIFF_COMMAND_ELEMENT); - diff_command->add_property("midi-source", _model->midi_source()->id().to_s()); - - XMLNode* changes = diff_command->add_child(DIFF_NOTES_ELEMENT); - for_each(_changes.begin(), _changes.end(), - boost::bind ( - boost::bind (&XMLNode::add_child_nocopy, changes, _1), - boost::bind (&NoteDiffCommand::marshal_change, this, _1))); - - XMLNode* added_notes = diff_command->add_child(ADDED_NOTES_ELEMENT); - for_each(_added_notes.begin(), _added_notes.end(), - boost::bind( - boost::bind (&XMLNode::add_child_nocopy, added_notes, _1), - boost::bind (&NoteDiffCommand::marshal_note, this, _1))); - - XMLNode* removed_notes = diff_command->add_child(REMOVED_NOTES_ELEMENT); - for_each(_removed_notes.begin(), _removed_notes.end(), - boost::bind ( - boost::bind (&XMLNode::add_child_nocopy, removed_notes, _1), - boost::bind (&NoteDiffCommand::marshal_note, this, _1))); - - /* if this command had side-effects, store that state too - */ - - if (!side_effect_removals.empty()) { - XMLNode* side_effect_notes = diff_command->add_child(SIDE_EFFECT_REMOVALS_ELEMENT); - for_each(side_effect_removals.begin(), side_effect_removals.end(), - boost::bind ( - boost::bind (&XMLNode::add_child_nocopy, side_effect_notes, _1), - boost::bind (&NoteDiffCommand::marshal_note, this, _1))); - } - - return *diff_command; + XMLNode* diff_command = new XMLNode (NOTE_DIFF_COMMAND_ELEMENT); + diff_command->add_property("midi-source", _model->midi_source()->id().to_s()); + + XMLNode* changes = diff_command->add_child(DIFF_NOTES_ELEMENT); + for_each(_changes.begin(), _changes.end(), + boost::bind ( + boost::bind (&XMLNode::add_child_nocopy, changes, _1), + boost::bind (&NoteDiffCommand::marshal_change, this, _1))); + + XMLNode* added_notes = diff_command->add_child(ADDED_NOTES_ELEMENT); + for_each(_added_notes.begin(), _added_notes.end(), + boost::bind( + boost::bind (&XMLNode::add_child_nocopy, added_notes, _1), + boost::bind (&NoteDiffCommand::marshal_note, this, _1))); + + XMLNode* removed_notes = diff_command->add_child(REMOVED_NOTES_ELEMENT); + for_each(_removed_notes.begin(), _removed_notes.end(), + boost::bind ( + boost::bind (&XMLNode::add_child_nocopy, removed_notes, _1), + boost::bind (&NoteDiffCommand::marshal_note, this, _1))); + + /* if this command had side-effects, store that state too + */ + + if (!side_effect_removals.empty()) { + XMLNode* side_effect_notes = diff_command->add_child(SIDE_EFFECT_REMOVALS_ELEMENT); + for_each(side_effect_removals.begin(), side_effect_removals.end(), + boost::bind ( + boost::bind (&XMLNode::add_child_nocopy, side_effect_notes, _1), + boost::bind (&NoteDiffCommand::marshal_note, this, _1))); + } + + return *diff_command; } MidiModel::SysExDiffCommand::SysExDiffCommand (boost::shared_ptr m, const XMLNode& node) @@ -771,123 +771,123 @@ MidiModel::SysExDiffCommand::undo () } - _model->ContentsChanged(); /* EMIT SIGNAL */ + _model->ContentsChanged(); /* EMIT SIGNAL */ } XMLNode& MidiModel::SysExDiffCommand::marshal_change (const Change& change) { - XMLNode* xml_change = new XMLNode ("Change"); + XMLNode* xml_change = new XMLNode ("Change"); - /* first, the change itself */ + /* first, the change itself */ - xml_change->add_property ("property", enum_2_string (change.property)); + xml_change->add_property ("property", enum_2_string (change.property)); - { - ostringstream old_value_str (ios::ate); + { + ostringstream old_value_str (ios::ate); old_value_str << change.old_time; - xml_change->add_property ("old", old_value_str.str()); - } + xml_change->add_property ("old", old_value_str.str()); + } - { - ostringstream new_value_str (ios::ate); + { + ostringstream new_value_str (ios::ate); new_value_str << change.new_time; - xml_change->add_property ("new", new_value_str.str()); - } + xml_change->add_property ("new", new_value_str.str()); + } - ostringstream id_str; - id_str << change.sysex->id(); - xml_change->add_property ("id", id_str.str()); + ostringstream id_str; + id_str << change.sysex->id(); + xml_change->add_property ("id", id_str.str()); - return *xml_change; + return *xml_change; } MidiModel::SysExDiffCommand::Change MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change) { - XMLProperty* prop; - Change change; + XMLProperty* prop; + Change change; - if ((prop = xml_change->property ("property")) != 0) { - change.property = (Property) string_2_enum (prop->value(), change.property); - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } + if ((prop = xml_change->property ("property")) != 0) { + change.property = (Property) string_2_enum (prop->value(), change.property); + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } - if ((prop = xml_change->property ("id")) == 0) { - error << _("No SysExID found for sys-ex property change - ignored") << endmsg; - return change; - } + if ((prop = xml_change->property ("id")) == 0) { + error << _("No SysExID found for sys-ex property change - ignored") << endmsg; + return change; + } - gint sysex_id = atoi (prop->value().c_str()); + gint sysex_id = atoi (prop->value().c_str()); - if ((prop = xml_change->property ("old")) != 0) { - istringstream old_str (prop->value()); + if ((prop = xml_change->property ("old")) != 0) { + istringstream old_str (prop->value()); old_str >> change.old_time; - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } - if ((prop = xml_change->property ("new")) != 0) { - istringstream new_str (prop->value()); + if ((prop = xml_change->property ("new")) != 0) { + istringstream new_str (prop->value()); new_str >> change.new_time; - } else { - fatal << "!!!" << endmsg; - /*NOTREACHED*/ - } + } else { + fatal << "!!!" << endmsg; + /*NOTREACHED*/ + } - /* we must point at the instance of the sysex that is actually in the model. - so go look for it ... - */ + /* we must point at the instance of the sysex that is actually in the model. + so go look for it ... + */ - change.sysex = _model->find_sysex (sysex_id); + change.sysex = _model->find_sysex (sysex_id); - if (!change.sysex) { - warning << "Sys-ex #" << sysex_id << " not found in model - programmers should investigate this" << endmsg; - return change; - } + if (!change.sysex) { + warning << "Sys-ex #" << sysex_id << " not found in model - programmers should investigate this" << endmsg; + return change; + } - return change; + return change; } int MidiModel::SysExDiffCommand::set_state (const XMLNode& diff_command, int /*version*/) { - if (diff_command.name() != string (SYSEX_DIFF_COMMAND_ELEMENT)) { - return 1; - } + if (diff_command.name() != string (SYSEX_DIFF_COMMAND_ELEMENT)) { + return 1; + } - /* changes */ + /* changes */ - _changes.clear(); + _changes.clear(); - XMLNode* changed_sysexes = diff_command.child (DIFF_SYSEXES_ELEMENT); + XMLNode* changed_sysexes = diff_command.child (DIFF_SYSEXES_ELEMENT); - if (changed_sysexes) { - XMLNodeList sysexes = changed_sysexes->children(); - transform (sysexes.begin(), sysexes.end(), back_inserter (_changes), - boost::bind (&SysExDiffCommand::unmarshal_change, this, _1)); + if (changed_sysexes) { + XMLNodeList sysexes = changed_sysexes->children(); + transform (sysexes.begin(), sysexes.end(), back_inserter (_changes), + boost::bind (&SysExDiffCommand::unmarshal_change, this, _1)); - } + } - return 0; + return 0; } XMLNode& MidiModel::SysExDiffCommand::get_state () { - XMLNode* diff_command = new XMLNode (SYSEX_DIFF_COMMAND_ELEMENT); - diff_command->add_property ("midi-source", _model->midi_source()->id().to_s()); + XMLNode* diff_command = new XMLNode (SYSEX_DIFF_COMMAND_ELEMENT); + diff_command->add_property ("midi-source", _model->midi_source()->id().to_s()); - XMLNode* changes = diff_command->add_child(DIFF_SYSEXES_ELEMENT); - for_each (_changes.begin(), _changes.end(), - boost::bind ( - boost::bind (&XMLNode::add_child_nocopy, changes, _1), - boost::bind (&SysExDiffCommand::marshal_change, this, _1))); + XMLNode* changes = diff_command->add_child(DIFF_SYSEXES_ELEMENT); + for_each (_changes.begin(), _changes.end(), + boost::bind ( + boost::bind (&XMLNode::add_child_nocopy, changes, _1), + boost::bind (&SysExDiffCommand::marshal_change, this, _1))); - return *diff_command; + return *diff_command; } /** Write all of the model to a MidiSource (i.e. save the model). @@ -903,27 +903,27 @@ MidiModel::SysExDiffCommand::get_state () bool MidiModel::write_to (boost::shared_ptr source) { - ReadLock lock(read_lock()); + ReadLock lock(read_lock()); - const bool old_percussive = percussive(); - set_percussive(false); + const bool old_percussive = percussive(); + set_percussive(false); boost::shared_ptr ms = _midi_source.lock (); assert (ms); - source->drop_model(); - source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position ()); + source->drop_model(); + source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position ()); - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - source->append_event_unlocked_beats(*i); - } + for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { + source->append_event_unlocked_beats(*i); + } - set_percussive(old_percussive); - source->mark_streaming_write_completed(); + set_percussive(old_percussive); + source->mark_streaming_write_completed(); - set_edited(false); + set_edited(false); - return true; + return true; } /** very similar to ::write_to() but writes to the model's own @@ -934,26 +934,26 @@ MidiModel::write_to (boost::shared_ptr source) bool MidiModel::sync_to_source () { - ReadLock lock(read_lock()); + ReadLock lock(read_lock()); - const bool old_percussive = percussive(); - set_percussive(false); + const bool old_percussive = percussive(); + set_percussive(false); boost::shared_ptr ms = _midi_source.lock (); assert (ms); - ms->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); + ms->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - ms->append_event_unlocked_beats(*i); - } + for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { + ms->append_event_unlocked_beats(*i); + } - set_percussive (old_percussive); - ms->mark_streaming_write_completed (); + set_percussive (old_percussive); + ms->mark_streaming_write_completed (); - set_edited (false); + set_edited (false); - return true; + return true; } /** Write part or all of the model to a MidiSource (i.e. save the model). @@ -966,138 +966,138 @@ MidiModel::sync_to_source () bool MidiModel::write_section_to (boost::shared_ptr source, Evoral::MusicalTime begin_time, Evoral::MusicalTime end_time) { - ReadLock lock(read_lock()); - MidiStateTracker mst; - Evoral::MusicalTime extra_note_on_time = end_time; + ReadLock lock(read_lock()); + MidiStateTracker mst; + Evoral::MusicalTime extra_note_on_time = end_time; - const bool old_percussive = percussive(); - set_percussive(false); + const bool old_percussive = percussive(); + set_percussive(false); boost::shared_ptr ms = _midi_source.lock (); assert (ms); - source->drop_model(); - source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); + source->drop_model(); + source->mark_streaming_midi_write_started (note_mode(), ms->timeline_position()); - for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { - const Evoral::Event& ev (*i); + for (Evoral::Sequence::const_iterator i = begin(0, true); i != end(); ++i) { + const Evoral::Event& ev (*i); - if (ev.time() >= begin_time && ev.time() < end_time) { + if (ev.time() >= begin_time && ev.time() < end_time) { - const Evoral::MIDIEvent* mev = - static_cast* > (&ev); + const Evoral::MIDIEvent* mev = + static_cast* > (&ev); - if (!mev) { - continue; - } + if (!mev) { + continue; + } - if (mev->is_note_off()) { + if (mev->is_note_off()) { - if (!mst.active (mev->note(), mev->channel())) { + if (!mst.active (mev->note(), mev->channel())) { - /* add a note-on at the start of the range we're writing - to the file. velocity is just an arbitary reasonable value. - */ + /* add a note-on at the start of the range we're writing + to the file. velocity is just an arbitary reasonable value. + */ - Evoral::MIDIEvent on (mev->event_type(), extra_note_on_time, 3, 0, true); - on.set_type (mev->type()); - on.set_note (mev->note()); - on.set_channel (mev->channel()); - on.set_velocity (mev->velocity()); + Evoral::MIDIEvent on (mev->event_type(), extra_note_on_time, 3, 0, true); + on.set_type (mev->type()); + on.set_note (mev->note()); + on.set_channel (mev->channel()); + on.set_velocity (mev->velocity()); - cerr << "Add note on for odd note off, note = " << (int) on.note() << endl; - source->append_event_unlocked_beats (on); - mst.add (on.note(), on.channel()); - mst.dump (cerr); - extra_note_on_time += 1.0/128.0; - } + cerr << "Add note on for odd note off, note = " << (int) on.note() << endl; + source->append_event_unlocked_beats (on); + mst.add (on.note(), on.channel()); + mst.dump (cerr); + extra_note_on_time += 1.0/128.0; + } - cerr << "MIDI Note off (note = " << (int) mev->note() << endl; - source->append_event_unlocked_beats (*i); - mst.remove (mev->note(), mev->channel()); - mst.dump (cerr); + cerr << "MIDI Note off (note = " << (int) mev->note() << endl; + source->append_event_unlocked_beats (*i); + mst.remove (mev->note(), mev->channel()); + mst.dump (cerr); - } else if (mev->is_note_on()) { - cerr << "MIDI Note on (note = " << (int) mev->note() << endl; - mst.add (mev->note(), mev->channel()); - source->append_event_unlocked_beats(*i); - mst.dump (cerr); - } else { - cerr << "MIDI other event type\n"; - source->append_event_unlocked_beats(*i); - } - } - } + } else if (mev->is_note_on()) { + cerr << "MIDI Note on (note = " << (int) mev->note() << endl; + mst.add (mev->note(), mev->channel()); + source->append_event_unlocked_beats(*i); + mst.dump (cerr); + } else { + cerr << "MIDI other event type\n"; + source->append_event_unlocked_beats(*i); + } + } + } - mst.resolve_notes (*source, end_time); + mst.resolve_notes (*source, end_time); - set_percussive(old_percussive); - source->mark_streaming_write_completed(); + set_percussive(old_percussive); + source->mark_streaming_write_completed(); - set_edited(false); + set_edited(false); - return true; + return true; } XMLNode& MidiModel::get_state() { - XMLNode *node = new XMLNode("MidiModel"); - return *node; + XMLNode *node = new XMLNode("MidiModel"); + return *node; } Evoral::Sequence::NotePtr MidiModel::find_note (NotePtr other) { - Notes::iterator l = notes().lower_bound(other); - - if (l != notes().end()) { - for (; (*l)->time() == other->time(); ++l) { - /* NB: compare note contents, not note pointers. - If "other" was a ptr to a note already in - the model, we wouldn't be looking for it, - would we now? - */ - if (**l == *other) { - return *l; - } - } - } - - return NotePtr(); + Notes::iterator l = notes().lower_bound(other); + + if (l != notes().end()) { + for (; (*l)->time() == other->time(); ++l) { + /* NB: compare note contents, not note pointers. + If "other" was a ptr to a note already in + the model, we wouldn't be looking for it, + would we now? + */ + if (**l == *other) { + return *l; + } + } + } + + return NotePtr(); } Evoral::Sequence::NotePtr MidiModel::find_note (gint note_id) { - /* used only for looking up notes when reloading history from disk, - so we don't care about performance *too* much. - */ + /* used only for looking up notes when reloading history from disk, + so we don't care about performance *too* much. + */ - for (Notes::iterator l = notes().begin(); l != notes().end(); ++l) { - if ((*l)->id() == note_id) { - return *l; - } - } + for (Notes::iterator l = notes().begin(); l != notes().end(); ++l) { + if ((*l)->id() == note_id) { + return *l; + } + } - return NotePtr(); + return NotePtr(); } boost::shared_ptr > MidiModel::find_sysex (gint sysex_id) { - /* used only for looking up notes when reloading history from disk, - so we don't care about performance *too* much. - */ + /* used only for looking up notes when reloading history from disk, + so we don't care about performance *too* much. + */ - for (SysExes::iterator l = sysexes().begin(); l != sysexes().end(); ++l) { - if ((*l)->id() == sysex_id) { - return *l; - } - } + for (SysExes::iterator l = sysexes().begin(); l != sysexes().end(); ++l) { + if ((*l)->id() == sysex_id) { + return *l; + } + } - return boost::shared_ptr > (); + return boost::shared_ptr > (); } /** Lock and invalidate the source. @@ -1109,9 +1109,9 @@ MidiModel::edit_lock() boost::shared_ptr ms = _midi_source.lock (); assert (ms); - Glib::Mutex::Lock* source_lock = new Glib::Mutex::Lock (ms->mutex()); - ms->invalidate(); // Release cached iterator's read lock on model - return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock)); + Glib::Mutex::Lock* source_lock = new Glib::Mutex::Lock (ms->mutex()); + ms->invalidate(); // Release cached iterator's read lock on model + return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock)); } /** Lock just the model, the source lock must already be held. @@ -1123,209 +1123,209 @@ MidiModel::write_lock() boost::shared_ptr ms = _midi_source.lock (); assert (ms); - assert (!ms->mutex().trylock ()); - return WriteLock(new WriteLockImpl(NULL, _lock, _control_lock)); + assert (!ms->mutex().trylock ()); + return WriteLock(new WriteLockImpl(NULL, _lock, _control_lock)); } int MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg) { - using namespace Evoral; + using namespace Evoral; - if (_writing || insert_merge_policy() == InsertMergeRelax) { - return 0; - } + if (_writing || insert_merge_policy() == InsertMergeRelax) { + return 0; + } - NoteDiffCommand* cmd = static_cast(arg); + NoteDiffCommand* cmd = static_cast(arg); - TimeType sa = note->time(); - TimeType ea = note->end_time(); + TimeType sa = note->time(); + TimeType ea = note->end_time(); - const Pitches& p (pitches (note->channel())); - NotePtr search_note(new Note(0, 0, 0, note->note())); - set to_be_deleted; - bool set_note_length = false; - bool set_note_time = false; - TimeType note_time = note->time(); - TimeType note_length = note->length(); + const Pitches& p (pitches (note->channel())); + NotePtr search_note(new Note(0, 0, 0, note->note())); + set to_be_deleted; + bool set_note_length = false; + bool set_note_time = false; + TimeType note_time = note->time(); + TimeType note_length = note->length(); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 checking overlaps for note %2 @ %3\n", this, (int)note->note(), note->time())); - for (Pitches::const_iterator i = p.lower_bound (search_note); - i != p.end() && (*i)->note() == note->note(); ++i) { - - TimeType sb = (*i)->time(); - TimeType eb = (*i)->end_time(); - OverlapType overlap = OverlapNone; - - if ((sb > sa) && (eb <= ea)) { - overlap = OverlapInternal; - } else if ((eb >= sa) && (eb <= ea)) { - overlap = OverlapStart; - } else if ((sb > sa) && (sb <= ea)) { - overlap = OverlapEnd; - } else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) { - overlap = OverlapExternal; - } else { - /* no overlap */ - continue; - } + for (Pitches::const_iterator i = p.lower_bound (search_note); + i != p.end() && (*i)->note() == note->note(); ++i) { + + TimeType sb = (*i)->time(); + TimeType eb = (*i)->end_time(); + OverlapType overlap = OverlapNone; + + if ((sb > sa) && (eb <= ea)) { + overlap = OverlapInternal; + } else if ((eb >= sa) && (eb <= ea)) { + overlap = OverlapStart; + } else if ((sb > sa) && (sb <= ea)) { + overlap = OverlapEnd; + } else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) { + overlap = OverlapExternal; + } else { + /* no overlap */ + continue; + } DEBUG_TRACE (DEBUG::Sequence, string_compose ("\toverlap is %1 for (%2,%3) vs (%4,%5)\n", enum_2_string(overlap), - sa, ea, sb, eb)); - - if (insert_merge_policy() == InsertMergeReject) { - DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 just reject\n", this)); - return -1; - } - - switch (overlap) { - case OverlapStart: - cerr << "OverlapStart\n"; - /* existing note covers start of new note */ - switch (insert_merge_policy()) { - case InsertMergeReplace: - to_be_deleted.insert (*i); - break; - case InsertMergeTruncateExisting: - if (cmd) { - cmd->change (*i, NoteDiffCommand::Length, (note->time() - (*i)->time())); - } - (*i)->set_length (note->time() - (*i)->time()); - break; - case InsertMergeTruncateAddition: - set_note_time = true; - set_note_length = true; - note_time = (*i)->time() + (*i)->length(); - note_length = min (note_length, (*i)->length() - ((*i)->end_time() - note->time())); - break; - case InsertMergeExtend: - if (cmd) { - cmd->change ((*i), NoteDiffCommand::Length, note->end_time() - (*i)->time()); - } - (*i)->set_length (note->end_time() - (*i)->time()); - return -1; /* do not add the new note */ - break; - default: - /*NOTREACHED*/ - /* stupid gcc */ - break; - } - break; - - case OverlapEnd: - cerr << "OverlapEnd\n"; - /* existing note covers end of new note */ - switch (insert_merge_policy()) { - case InsertMergeReplace: - to_be_deleted.insert (*i); - break; - - case InsertMergeTruncateExisting: - /* resetting the start time of the existing note - is a problem because of time ordering. - */ - break; - - case InsertMergeTruncateAddition: - set_note_length = true; - note_length = min (note_length, ((*i)->time() - note->time())); - break; - - case InsertMergeExtend: - /* we can't reset the time of the existing note because - that will corrupt time ordering. So remove the - existing note and change the position/length - of the new note (which has not been added yet) - */ - to_be_deleted.insert (*i); - set_note_length = true; - note_length = min (note_length, (*i)->end_time() - note->time()); - break; - default: - /*NOTREACHED*/ - /* stupid gcc */ - break; - } - break; - - case OverlapExternal: - cerr << "OverlapExt\n"; - /* existing note overlaps all the new note */ - switch (insert_merge_policy()) { - case InsertMergeReplace: - to_be_deleted.insert (*i); - break; - case InsertMergeTruncateExisting: - case InsertMergeTruncateAddition: - case InsertMergeExtend: - /* cannot add in this case */ - return -1; - default: - /*NOTREACHED*/ - /* stupid gcc */ - break; - } - break; - - case OverlapInternal: - cerr << "OverlapInt\n"; - /* new note fully overlaps an existing note */ - switch (insert_merge_policy()) { - case InsertMergeReplace: - case InsertMergeTruncateExisting: - case InsertMergeTruncateAddition: - case InsertMergeExtend: - /* delete the existing note, the new one will cover it */ - to_be_deleted.insert (*i); - break; - default: - /*NOTREACHED*/ - /* stupid gcc */ - break; - } - break; - - default: - /*NOTREACHED*/ - /* stupid gcc */ - break; - } - } - - for (set::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) { - remove_note_unlocked (*i); - - if (cmd) { - cmd->side_effect_remove (*i); - } - } - - if (set_note_time) { - if (cmd) { - cmd->change (note, NoteDiffCommand::StartTime, note_time); - } - note->set_time (note_time); - } - - if (set_note_length) { - if (cmd) { - cmd->change (note, NoteDiffCommand::Length, note_length); - } - note->set_length (note_length); - } - - return 0; + sa, ea, sb, eb)); + + if (insert_merge_policy() == InsertMergeReject) { + DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 just reject\n", this)); + return -1; + } + + switch (overlap) { + case OverlapStart: + cerr << "OverlapStart\n"; + /* existing note covers start of new note */ + switch (insert_merge_policy()) { + case InsertMergeReplace: + to_be_deleted.insert (*i); + break; + case InsertMergeTruncateExisting: + if (cmd) { + cmd->change (*i, NoteDiffCommand::Length, (note->time() - (*i)->time())); + } + (*i)->set_length (note->time() - (*i)->time()); + break; + case InsertMergeTruncateAddition: + set_note_time = true; + set_note_length = true; + note_time = (*i)->time() + (*i)->length(); + note_length = min (note_length, (*i)->length() - ((*i)->end_time() - note->time())); + break; + case InsertMergeExtend: + if (cmd) { + cmd->change ((*i), NoteDiffCommand::Length, note->end_time() - (*i)->time()); + } + (*i)->set_length (note->end_time() - (*i)->time()); + return -1; /* do not add the new note */ + break; + default: + /*NOTREACHED*/ + /* stupid gcc */ + break; + } + break; + + case OverlapEnd: + cerr << "OverlapEnd\n"; + /* existing note covers end of new note */ + switch (insert_merge_policy()) { + case InsertMergeReplace: + to_be_deleted.insert (*i); + break; + + case InsertMergeTruncateExisting: + /* resetting the start time of the existing note + is a problem because of time ordering. + */ + break; + + case InsertMergeTruncateAddition: + set_note_length = true; + note_length = min (note_length, ((*i)->time() - note->time())); + break; + + case InsertMergeExtend: + /* we can't reset the time of the existing note because + that will corrupt time ordering. So remove the + existing note and change the position/length + of the new note (which has not been added yet) + */ + to_be_deleted.insert (*i); + set_note_length = true; + note_length = min (note_length, (*i)->end_time() - note->time()); + break; + default: + /*NOTREACHED*/ + /* stupid gcc */ + break; + } + break; + + case OverlapExternal: + cerr << "OverlapExt\n"; + /* existing note overlaps all the new note */ + switch (insert_merge_policy()) { + case InsertMergeReplace: + to_be_deleted.insert (*i); + break; + case InsertMergeTruncateExisting: + case InsertMergeTruncateAddition: + case InsertMergeExtend: + /* cannot add in this case */ + return -1; + default: + /*NOTREACHED*/ + /* stupid gcc */ + break; + } + break; + + case OverlapInternal: + cerr << "OverlapInt\n"; + /* new note fully overlaps an existing note */ + switch (insert_merge_policy()) { + case InsertMergeReplace: + case InsertMergeTruncateExisting: + case InsertMergeTruncateAddition: + case InsertMergeExtend: + /* delete the existing note, the new one will cover it */ + to_be_deleted.insert (*i); + break; + default: + /*NOTREACHED*/ + /* stupid gcc */ + break; + } + break; + + default: + /*NOTREACHED*/ + /* stupid gcc */ + break; + } + } + + for (set::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) { + remove_note_unlocked (*i); + + if (cmd) { + cmd->side_effect_remove (*i); + } + } + + if (set_note_time) { + if (cmd) { + cmd->change (note, NoteDiffCommand::StartTime, note_time); + } + note->set_time (note_time); + } + + if (set_note_length) { + if (cmd) { + cmd->change (note, NoteDiffCommand::Length, note_length); + } + note->set_length (note_length); + } + + return 0; } InsertMergePolicy MidiModel::insert_merge_policy () const { - /* XXX ultimately this should be a per-track or even per-model policy */ + /* XXX ultimately this should be a per-track or even per-model policy */ boost::shared_ptr ms = _midi_source.lock (); assert (ms); - return ms->session().config.get_insert_merge_policy (); + return ms->session().config.get_insert_merge_policy (); } void diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 85ff1fee5d..cb1d178b8b 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -51,16 +51,16 @@ namespace ARDOUR { namespace Properties { PBD::PropertyDescriptor midi_data; PBD::PropertyDescriptor length_beats; - } + } } void MidiRegion::make_property_quarks () { - Properties::midi_data.property_id = g_quark_from_static_string (X_("midi-data")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for midi-data = %1\n", Properties::midi_data.property_id)); - Properties::length_beats.property_id = g_quark_from_static_string (X_("length-beats")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length-beats = %1\n", Properties::length_beats.property_id)); + Properties::midi_data.property_id = g_quark_from_static_string (X_("midi-data")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for midi-data = %1\n", Properties::midi_data.property_id)); + Properties::length_beats.property_id = g_quark_from_static_string (X_("length-beats")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length-beats = %1\n", Properties::length_beats.property_id)); } void @@ -72,10 +72,12 @@ MidiRegion::register_properties () /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (const SourceList& srcs) : Region (srcs) - , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) + , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) { - update_length_beats (); - register_properties (); + _length_beats = midi_source(0)->length_beats(); + cout << "NEW MIDI REGION LENGTH BEATS: " << _length_beats << endl; + + register_properties (); midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); model_changed (); @@ -86,10 +88,10 @@ MidiRegion::MidiRegion (const SourceList& srcs) /** Create a new MidiRegion, that is part of an existing one */ MidiRegion::MidiRegion (boost::shared_ptr other, frameoffset_t offset, bool offset_relative) : Region (other, offset, offset_relative) - , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) + , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0) { - update_length_beats (); - register_properties (); + update_length_beats (); + register_properties (); assert(_name.val().find("/") == string::npos); midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this)); @@ -105,60 +107,60 @@ MidiRegion::~MidiRegion () boost::shared_ptr MidiRegion::clone () { - BeatsFramesConverter bfc (_session.tempo_map(), _position); + BeatsFramesConverter bfc (_session.tempo_map(), _position); Evoral::MusicalTime const bbegin = bfc.from (_start); Evoral::MusicalTime const bend = bfc.from (_start + _length); - boost::shared_ptr ms = midi_source(0)->clone (bbegin, bend); + boost::shared_ptr ms = midi_source(0)->clone (bbegin, bend); - PropertyList plist; + PropertyList plist; - plist.add (Properties::name, ms->name()); - plist.add (Properties::whole_file, true); - plist.add (Properties::start, _start); - plist.add (Properties::length, _length); - plist.add (Properties::length_beats, _length_beats); - plist.add (Properties::layer, 0); + plist.add (Properties::name, ms->name()); + plist.add (Properties::whole_file, true); + plist.add (Properties::start, _start); + plist.add (Properties::length, _length); + plist.add (Properties::length_beats, _length_beats); + plist.add (Properties::layer, 0); - return boost::dynamic_pointer_cast (RegionFactory::create (ms, plist, true)); + return boost::dynamic_pointer_cast (RegionFactory::create (ms, plist, true)); } void MidiRegion::post_set (const PropertyChange& pc) { - if (pc.contains (Properties::length) || pc.contains (Properties::position)) { - update_length_beats (); - } + if (pc.contains (Properties::length) || pc.contains (Properties::position)) { + update_length_beats (); + } } void MidiRegion::set_length_internal (framecnt_t len) { - Region::set_length_internal (len); - update_length_beats (); + Region::set_length_internal (len); + update_length_beats (); } void MidiRegion::update_length_beats () { BeatsFramesConverter converter (_session.tempo_map(), _position); - _length_beats = converter.from (_length); + _length_beats = converter.from (_length); } void MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) { Region::set_position_internal (pos, allow_bbt_recompute); - /* zero length regions don't exist - so if _length_beats is zero, this object - is under construction. - */ - if (_length_beats) { - /* leave _length_beats alone, and change _length to reflect the state of things - at the new position (tempo map may dictate a different number of frames - */ - BeatsFramesConverter converter (_session.tempo_map(), _position); - Region::set_length_internal (converter.to (_length_beats)); - } + /* zero length regions don't exist - so if _length_beats is zero, this object + is under construction. + */ + if (_length_beats) { + /* leave _length_beats alone, and change _length to reflect the state of things + at the new position (tempo map may dictate a different number of frames + */ + BeatsFramesConverter converter (_session.tempo_map(), _position); + Region::set_length_internal (converter.to (_length_beats)); + } } framecnt_t @@ -247,11 +249,11 @@ MidiRegion::set_state (const XMLNode& node, int version) { int ret = Region::set_state (node, version); - if (ret == 0) { - update_length_beats (); - } + if (ret == 0) { + update_length_beats (); + } - return ret; + return ret; } void @@ -327,7 +329,7 @@ MidiRegion::model_changed () void MidiRegion::model_contents_changed () { - send_change (PropertyChange (Properties::midi_data)); + send_change (PropertyChange (Properties::midi_data)); } void @@ -358,7 +360,7 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) void MidiRegion::fix_negative_start () { - BeatsFramesConverter c (_session.tempo_map(), _position); + BeatsFramesConverter c (_session.tempo_map(), _position); model()->insert_silence_at_start (c.from (-_start)); _start = 0; diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 120ee29e8e..d330eb2bcd 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -168,15 +168,15 @@ MidiSource::set_state (const XMLNode& node, int /*version*/) bool MidiSource::empty () const { - return _length_beats == 0; + return _length_beats == 0; } framecnt_t MidiSource::length (framepos_t pos) const { - if (_length_beats == 0) { - return 0; - } + if (_length_beats == 0) { + return 0; + } BeatsFramesConverter converter(_session.tempo_map(), pos); return converter.to(_length_beats); @@ -200,7 +200,7 @@ framecnt_t MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_start, framepos_t start, framecnt_t cnt, MidiStateTracker* tracker, - std::set const & filtered) const + std::set const & filtered) const { Glib::Mutex::Lock lm (_lock); @@ -298,86 +298,84 @@ MidiSource::mark_streaming_write_completed () boost::shared_ptr MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end) { - string newname = PBD::basename_nosuffix(_name.val()); - string newpath; + string newname = PBD::basename_nosuffix(_name.val()); + string newpath; - /* get a new name for the MIDI file we're going to write to - */ + /* get a new name for the MIDI file we're going to write to + */ - do { + do { - newname = bump_name_once (newname, '-'); - /* XXX build path safely */ - newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid"; + newname = bump_name_once (newname, '-'); + /* XXX build path safely */ + newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid"; - } while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)); + } while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)); - boost::shared_ptr newsrc = boost::dynamic_pointer_cast( - SourceFactory::createWritable(DataType::MIDI, _session, - newpath, string(), false, _session.frame_rate())); + boost::shared_ptr newsrc = boost::dynamic_pointer_cast( + SourceFactory::createWritable(DataType::MIDI, _session, + newpath, string(), false, _session.frame_rate())); - newsrc->set_timeline_position(_timeline_position); + newsrc->set_timeline_position(_timeline_position); newsrc->copy_interpolation_from (this); newsrc->copy_automation_state_from (this); - if (_model) { - if (begin == Evoral::MinMusicalTime && end == Evoral::MaxMusicalTime) { - _model->write_to (newsrc); - } else { - _model->write_section_to (newsrc, begin, end); - } - } else { - error << string_compose (_("programming error: %1"), X_("no model for MidiSource during ::clone()")); - return boost::shared_ptr(); - } + if (_model) { + if (begin == Evoral::MinMusicalTime && end == Evoral::MaxMusicalTime) { + _model->write_to (newsrc); + } else { + _model->write_section_to (newsrc, begin, end); + } + } else { + error << string_compose (_("programming error: %1"), X_("no model for MidiSource during ::clone()")); + return boost::shared_ptr(); + } - newsrc->flush_midi(); + newsrc->flush_midi(); - /* force a reload of the model if the range is partial */ + /* force a reload of the model if the range is partial */ - if (begin != Evoral::MinMusicalTime || end != Evoral::MaxMusicalTime) { - newsrc->load_model (true, true); - } else { + if (begin != Evoral::MinMusicalTime || end != Evoral::MaxMusicalTime) { + newsrc->load_model (true, true); + } else { newsrc->set_model (_model); } - return newsrc; + return newsrc; } void MidiSource::session_saved() { - /* this writes a copy of the data to disk. - XXX do we need to do this every time? - */ + /* this writes a copy of the data to disk. + XXX do we need to do this every time? + */ if (_model && _model->edited()) { + // if the model is edited, write its contents into + // the current source file (overwiting previous contents. + /* temporarily drop our reference to the model so that + as the model pushes its current state to us, we don't + try to update it. + */ - // if the model is edited, write its contents into - // the current source file (overwiting previous contents. - - /* temporarily drop our reference to the model so that - as the model pushes its current state to us, we don't - try to update it. - */ - - boost::shared_ptr mm = _model ; - _model.reset (); + boost::shared_ptr mm = _model ; + _model.reset (); - /* flush model contents to disk - */ + /* flush model contents to disk + */ - mm->sync_to_source (); + mm->sync_to_source (); - /* reacquire model */ + /* reacquire model */ - _model = mm; + _model = mm; - } else { - flush_midi(); - } + } else { + flush_midi(); + } } void @@ -391,7 +389,7 @@ MidiSource::set_note_mode(NoteMode mode) void MidiSource::drop_model () { - _model.reset(); + _model.reset(); ModelChanged (); /* EMIT SIGNAL */ } diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index cbbf73b682..f5020e08a7 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -140,21 +140,20 @@ MidiStateTracker::resolve_notes (MidiSource& src, Evoral::MusicalTime time) return; } - /* NOTE: the src must be locked */ + /* NOTE: the src must be locked */ for (int channel = 0; channel < 16; ++channel) { for (int note = 0; note < 128; ++note) { while (_active_notes[note + 128 * channel]) { - Evoral::MIDIEvent ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true); - ev.set_type (MIDI_CMD_NOTE_OFF); - ev.set_channel (channel); - ev.set_note (note); - ev.set_velocity (0); - src.append_event_unlocked_beats (ev); + Evoral::MIDIEvent ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true); + ev.set_type (MIDI_CMD_NOTE_OFF); + ev.set_channel (channel); + ev.set_note (note); + ev.set_velocity (0); + src.append_event_unlocked_beats (ev); _active_notes[note + 128 * channel]--; - /* don't stack events up at the same time - */ - time += 1.0/128.0; + /* don't stack events up at the same time */ + time += 1.0/128.0; } } } diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 78c3e55811..8152a53834 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -60,7 +60,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) , _smf_last_read_end (0) , _smf_last_read_time (0) { - /* note that origin remains empty */ + /* note that origin remains empty */ if (init(_path, false)) { throw failed_constructor (); @@ -131,7 +131,7 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, framepos_t DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: seek to %1\n", start)); Evoral::SMF::seek_to_start(); while (time < start_ticks) { - gint ignored; + gint ignored; ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF @@ -148,7 +148,7 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, framepos_t _smf_last_read_end = start + duration; while (true) { - gint ignored; /* XXX don't ignore note id's ??*/ + gint ignored; /* XXX don't ignore note id's ??*/ ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF @@ -250,7 +250,7 @@ SMFSource::write_unlocked (MidiRingBuffer& source, framepos_t positi ev.set(buf, size, time); ev.set_event_type(EventTypeMap::instance().midi_event_type(ev.buffer()[0])); - ev.set_id (Evoral::next_event_id()); + ev.set_id (Evoral::next_event_id()); if (!(ev.is_channel_event() || ev.is_smf_meta_event() || ev.is_sysex())) { /*cerr << "SMFSource: WARNING: caller tried to write non SMF-Event of type " @@ -287,13 +287,13 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) return; } - Evoral::event_id_t event_id; + Evoral::event_id_t event_id; - if (ev.id() < 0) { - event_id = Evoral::next_event_id(); - } else { - event_id = ev.id(); - } + if (ev.id() < 0) { + event_id = Evoral::next_event_id(); + } else { + event_id = ev.id(); + } if (_model) { _model->append (ev, event_id); @@ -330,28 +330,28 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, fr } BeatsFramesConverter converter(_session.tempo_map(), position); - const double ev_time_beats = converter.from(ev.time()); - Evoral::event_id_t event_id; + const double ev_time_beats = converter.from(ev.time()); + Evoral::event_id_t event_id; - if (ev.id() < 0) { - event_id = Evoral::next_event_id(); - } else { - event_id = ev.id(); - } + if (ev.id() < 0) { + event_id = Evoral::next_event_id(); + } else { + event_id = ev.id(); + } if (_model) { const Evoral::Event beat_ev (ev.event_type(), - ev_time_beats, - ev.size(), - (uint8_t*)ev.buffer()); + ev_time_beats, + ev.size(), + (uint8_t*)ev.buffer()); _model->append (beat_ev, event_id); } _length_beats = max(_length_beats, ev_time_beats); const framepos_t delta_time_frames = ev.time() - _last_ev_time_frames; - const double delta_time_beats = converter.from(delta_time_frames); - const uint32_t delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn())); + const double delta_time_beats = converter.from(delta_time_frames); + const uint32_t delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn())); Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id); _last_ev_time_frames = ev.time(); @@ -363,9 +363,9 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, fr XMLNode& SMFSource::get_state () { - XMLNode& node = MidiSource::get_state(); - node.add_property (X_("origin"), _origin); - return node; + XMLNode& node = MidiSource::get_state(); + node.add_property (X_("origin"), _origin); + return node; } int @@ -412,9 +412,9 @@ SMFSource::mark_streaming_write_completed () Evoral::SMF::end_write (); - /* data in the file now, not removable */ + /* data in the file now, not removable */ - mark_nonremovable (); + mark_nonremovable (); } bool @@ -456,63 +456,63 @@ SMFSource::load_model (bool lock, bool force_reload) uint32_t size = 0; uint8_t* buf = NULL; int ret; - gint event_id; - bool have_event_id = false; + gint event_id; + bool have_event_id = false; while ((ret = read_event (&delta_t, &size, &buf, &event_id)) >= 0) { time += delta_t; - if (ret == 0) { + if (ret == 0) { - /* meta-event : did we get an event ID ? - */ + /* meta-event : did we get an event ID ? + */ - if (event_id >= 0) { - have_event_id = true; - } + if (event_id >= 0) { + have_event_id = true; + } - continue; - } + continue; + } if (ret > 0) { - /* not a meta-event */ + /* not a meta-event */ - ev.set (buf, size, time / (double)ppqn()); + ev.set (buf, size, time / (double)ppqn()); ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0])); - if (!have_event_id) { - event_id = Evoral::next_event_id(); - } + if (!have_event_id) { + event_id = Evoral::next_event_id(); + } #ifndef NDEBUG - std::string ss; + std::string ss; - for (uint32_t xx = 0; xx < size; ++xx) { - char b[8]; - snprintf (b, sizeof (b), "0x%x ", buf[xx]); - ss += b; - } - - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF %6 load model delta %1, time %2, size %3 buf %4, type %5\n", - delta_t, time, size, ss , ev.event_type(), name())); + for (uint32_t xx = 0; xx < size; ++xx) { + char b[8]; + snprintf (b, sizeof (b), "0x%x ", buf[xx]); + ss += b; + } + + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF %6 load model delta %1, time %2, size %3 buf %4, type %5\n", + delta_t, time, size, ss , ev.event_type(), name())); #endif _model->append (ev, event_id); - if (ev.size() > scratch_size) { - scratch_size = ev.size(); - } + if (ev.size() > scratch_size) { + scratch_size = ev.size(); + } - ev.size() = scratch_size; // ensure read_event only allocates if necessary + ev.size() = scratch_size; // ensure read_event only allocates if necessary - _length_beats = max(_length_beats, ev.time()); - } + _length_beats = max(_length_beats, ev.time()); + } - /* event ID's must immediately precede the event they are for - */ + /* event ID's must immediately precede the event they are for + */ - have_event_id = false; + have_event_id = false; } _model->end_write(false); @@ -533,18 +533,18 @@ SMFSource::destroy_model () void SMFSource::flush_midi () { - if (!writable()) { - return; - } + if (!writable()) { + return; + } Evoral::SMF::end_write(); - /* data in the file means its no longer removable */ - mark_nonremovable (); + /* data in the file means its no longer removable */ + mark_nonremovable (); } void SMFSource::set_path (const string& p) { - FileSource::set_path (p); - SMF::set_path (_path); + FileSource::set_path (p); + SMF::set_path (_path); } -- cgit v1.2.3