diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-09-10 20:41:08 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-09-10 20:41:08 +0000 |
| commit | 7b8adc78b6082efb2c46822ddb5d8347a4e20e9e (patch) | |
| tree | 38a620d5515211d20b103c912c80f93ca83b5646 /libs/ardour/midi_model.cc | |
| parent | 5f319d0a08a4950f4cb8ee1bdc39f35bfce088bc (diff) | |
more MIDI editing cleanups, mostly fixing subtleties. Will break loading the history file for older sessions with MIDI editing present - we warned you :)
git-svn-id: svn://localhost/ardour2/branches/3.0@5651 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_model.cc')
| -rw-r--r-- | libs/ardour/midi_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 1dc022f274..95d6d6a924 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -254,8 +254,8 @@ MidiModel::DeltaCommand::unmarshal_note(XMLNode *xml_note) return note_ptr; } -#define ADDED_NOTES_ELEMENT "added_notes" -#define REMOVED_NOTES_ELEMENT "removed_notes" +#define ADDED_NOTES_ELEMENT "AddedNotes" +#define REMOVED_NOTES_ELEMENT "RemovedNotes" #define DELTA_COMMAND_ELEMENT "DeltaCommand" int @@ -301,7 +301,7 @@ MidiModel::DeltaCommand::get_state() /************** DIFF COMMAND ********************/ -#define DIFF_NOTES_ELEMENT "changed_notes" +#define DIFF_NOTES_ELEMENT "ChangedNotes" #define DIFF_COMMAND_ELEMENT "DiffCommand" MidiModel::DiffCommand::DiffCommand(boost::shared_ptr<MidiModel> m, const std::string& name) @@ -525,7 +525,7 @@ MidiModel::DiffCommand::unmarshal_change(XMLNode *xml_change) /*NOTREACHED*/ } - if ((prop = xml_change->property ("new")) == 0) { + if ((prop = xml_change->property ("new")) != 0) { istringstream new_str (prop->value()); new_str >> change.new_value; } else { |