microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 11:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inherit lyrics on note replacement

Browse Source
This commit is contained in:
Matthias Neeracher 2011-09-10 05:36:12 +02:00
parent f3acce05fa
commit 7d960d2033
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Sources/VLModel.cpp
View File

@ -613,15 +613,26 @@ void VLSong::AddNote(VLLyricsNote note, size_t measure, VLFraction at)
// //
if (i->fTied) { if (i->fTied) {
// //
// Break ties // Break backward ties, but not forward
// //
if (i->fTied & VLNote::kTiedWithPrev) if (i->fTied & VLNote::kTiedWithPrev) {
i->fTied &= ~VLNote::kTiedWithPrev;
LastTie(fMeasures[measure-1]) &= ~VLNote::kTiedWithNext; LastTie(fMeasures[measure-1]) &= ~VLNote::kTiedWithNext;
if (i->fTied & VLNote::kTiedWithNext) }
FirstTie(fMeasures[measure+1]) &= ~VLNote::kTiedWithPrev; if (i->fTied & VLNote::kTiedWithNext) {
VLNoteList::iterator j = i;
for (size_t tiedMeas = measure+1; j->fTied & VLNote::kTiedWithNext;++tiedMeas) {
j = fMeasures[tiedMeas].fMelody.begin();
j->fPitch = note.fPitch;
j->fVisual= note.fVisual;
}
}
} }
note.fDuration = i->fDuration; //
*i = note; // Deliberately leave fLyrics alone
//
i->fPitch = note.fPitch;
i->fVisual = note.fVisual;
} else { } else {
// //
// Overlap, split current // Overlap, split current