smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

finish the intention of the previous commit, correctly this time

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9979 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-08-11 16:06:31 +00:00
parent 1f845c0e32
commit a8449db466
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/evoral/src/Sequence.cpp
View file

@ -880,11 +880,11 @@ Sequence<Time>::append_note_on_unlocked (NotePtr note, event_id_t evid)
assert(_writing); assert(_writing);
if (note->note() > 127) { if (note->note() > 127) {
error << string_compose (_("illegal note number (%1) used in Note event - event will be ignored"), note->note()) << endmsg; error << string_compose (_("illegal note number (%1) used in Note on event - event will be ignored"), (int) note->note()) << endmsg;
return; return;
} }
if (note->channel() >= 16) { if (note->channel() >= 16) {
error << string_compose (_("illegal channel number (%1) used in Note event - event will be ignored"), note->channel()) << endmsg; error << string_compose (_("illegal channel number (%1) used in Note on event - event will be ignored"), (int) note->channel()) << endmsg;
return; return;
} }
@ -915,9 +915,17 @@ Sequence<Time>::append_note_off_unlocked (NotePtr note)
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 OFF @ %4 v=%5\n", DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 c=%2 note %3 OFF @ %4 v=%5\n",
this, (int)note->channel(), this, (int)note->channel(),
(int)note->note(), note->time(), (int)note->velocity())); (int)note->note(), note->time(), (int)note->velocity()));
assert(note->note() <= 127);
assert(note->channel() < 16);
assert(_writing); assert(_writing);
if (note->note() > 127) {
error << string_compose (_("illegal note number (%1) used in Note off event - event will be ignored"), (int) note->note()) << endmsg;
return;
}
if (note->channel() >= 16) {
error << string_compose (_("illegal channel number (%1) used in Note off event - event will be ignored"), (int) note->channel()) << endmsg;
return;
}
_edited = true; _edited = true;
if (_percussive) { if (_percussive) {