microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2025-01-03 08:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge adjacent rests

Browse Source
This commit is contained in:
Matthias Neeracher 2007-07-29 20:12:02 +00:00
parent a7b2fab331
commit b4204dd0e8
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/VLModel.cpp
View File

@ -706,6 +706,26 @@ void VLSong::AddNote(VLLyricsNote note, size_t measure, VLFraction at)
i->fDuration = at-t; i->fDuration = at-t;
i = fMeasures[measure].fMelody.insert(++i, note); i = fMeasures[measure].fMelody.insert(++i, note);
} }
if (i->fPitch == VLNote::kNoPitch) {
//
// Merge with adjacent rests
//
if (i != fMeasures[measure].fMelody.begin()) {
VLNoteList::iterator j = i;
--j;
if (j->fPitch == VLNote::kNoPitch) {
j->fDuration += i->fDuration;
fMeasures[measure].fMelody.erase(i);
i = j;
}
}
VLNoteList::iterator j = i;
++j;
if (j != fMeasures[measure].fMelody.end() && j->fPitch == VLNote::kNoPitch) {
i->fDuration += j->fDuration;
fMeasures[measure].fMelody.erase(j);
}
}
break; // Exit here break; // Exit here
} }
t = tEnd; t = tEnd;
@ -750,8 +770,14 @@ void VLSong::DelNote(size_t measure, VLFraction at)
fMeasures[measure].fMelody.erase(i); fMeasures[measure].fMelody.erase(i);
} else { } else {
// //
// Turn into rest // Merge with next if it's a rest, otherwise, just turn into rest
// //
VLNoteList::iterator j = i;
++j;
if (j != fMeasures[measure].fMelody.end() && j->fPitch == VLNote::kNoPitch) {
i->fDuration += j->fDuration;
fMeasures[measure].fMelody.erase(j);
}
i->fPitch = VLNote::kNoPitch; i->fPitch = VLNote::kNoPitch;
i->fTied = 0; i->fTied = 0;
} }