projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[ardour.git]
/
libs
/
ardour
/
midi_model.cc
diff --git
a/libs/ardour/midi_model.cc
b/libs/ardour/midi_model.cc
index 716d5117982a739627a6eef9b6b226a2f530aba4..259a04bc0ffa261191e663e7649ed34cf442c157 100644
(file)
--- a/
libs/ardour/midi_model.cc
+++ b/
libs/ardour/midi_model.cc
@@
-195,11
+195,11
@@
MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop,
case StartTime:
fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg;
case StartTime:
fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
break;
case Length:
fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg;
break;
case Length:
fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
break;
}
break;
}
@@
-627,7
+627,7
@@
MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
change.property = (Property) string_2_enum (prop->value(), change.property);
} else {
fatal << "!!!" << endmsg;
change.property = (Property) string_2_enum (prop->value(), change.property);
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
if ((prop = xml_change->property ("id")) == 0) {
}
if ((prop = xml_change->property ("id")) == 0) {
@@
-648,7
+648,7
@@
MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
}
} else {
fatal << "!!!" << endmsg;
}
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
if ((prop = xml_change->property ("new")) != 0) {
}
if ((prop = xml_change->property ("new")) != 0) {
@@
-662,7
+662,7
@@
MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
}
} else {
fatal << "!!!" << endmsg;
}
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
/* we must point at the instance of the note that is actually in the model.
}
/* we must point at the instance of the note that is actually in the model.
@@
-899,7
+899,7
@@
MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
change.property = (Property) string_2_enum (prop->value(), change.property);
} else {
fatal << "!!!" << endmsg;
change.property = (Property) string_2_enum (prop->value(), change.property);
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
if ((prop = xml_change->property ("id")) == 0) {
}
if ((prop = xml_change->property ("id")) == 0) {
@@
-914,7
+914,7
@@
MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
old_str >> change.old_time;
} else {
fatal << "!!!" << endmsg;
old_str >> change.old_time;
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
if ((prop = xml_change->property ("new")) != 0) {
}
if ((prop = xml_change->property ("new")) != 0) {
@@
-922,7
+922,7
@@
MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
new_str >> change.new_time;
} else {
fatal << "!!!" << endmsg;
new_str >> change.new_time;
} else {
fatal << "!!!" << endmsg;
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
}
/* we must point at the instance of the sysex that is actually in the model.
}
/* we must point at the instance of the sysex that is actually in the model.
@@
-1252,7
+1252,7
@@
MidiModel::PatchChangePtr
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
{
XMLProperty* prop;
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
{
XMLProperty* prop;
- Evoral::event_id_t id;
+ Evoral::event_id_t id
= 0
;
Evoral::MusicalTime time = 0;
int channel = 0;
int program = 0;
Evoral::MusicalTime time = 0;
int channel = 0;
int program = 0;
@@
-1284,6
+1284,7
@@
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
}
PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
}
PatchChangePtr p (new Evoral::PatchChange<TimeType> (time, channel, program, bank));
+ assert(id);
p->set_id (id);
return p;
}
p->set_id (id);
return p;
}
@@
-1727,7
+1728,7
@@
MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
return -1; /* do not add the new note */
break;
default:
return -1; /* do not add the new note */
break;
default:
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
/* stupid gcc */
break;
}
/* stupid gcc */
break;
}
@@
-1763,7
+1764,7
@@
MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
note_length = min (note_length, (*i)->end_time() - note->time());
break;
default:
note_length = min (note_length, (*i)->end_time() - note->time());
break;
default:
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
/* stupid gcc */
break;
}
/* stupid gcc */
break;
}
@@
-1782,7
+1783,7
@@
MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
/* cannot add in this case */
return -1;
default:
/* cannot add in this case */
return -1;
default:
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
/* stupid gcc */
break;
}
/* stupid gcc */
break;
}
@@
-1800,14
+1801,14
@@
MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
to_be_deleted.insert (*i);
break;
default:
to_be_deleted.insert (*i);
break;
default:
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
/* stupid gcc */
break;
}
break;
default:
/* stupid gcc */
break;
}
break;
default:
- /*NOTREACHED*/
+
abort();
/*NOTREACHED*/
/* stupid gcc */
break;
}
/* stupid gcc */
break;
}