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

Handle clicks on tied notes

Browse Source
This commit is contained in:
Matthias Neeracher 2008-03-30 19:52:32 +00:00
parent d16a8be705
commit 091da479ac
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/VLModel.cpp
View File

@ -1282,7 +1282,9 @@ bool VLSong::PrevWord(size_t stanza, size_t & measure, VLFraction & at)
VLFraction now(0); VLFraction now(0);
while (note != meas.fMelody.end() && now < at) { while (note != meas.fMelody.end() && now < at) {
if (note->fPitch != VLNote::kNoPitch) if (!(note->fTied & VLNote::kTiedWithPrev)
&& note->fPitch != VLNote::kNoPitch
)
if (note->fLyrics.size() < stanza if (note->fLyrics.size() < stanza
|| !(note->fLyrics[stanza-1].fKind & VLSyllable::kHasPrev) || !(note->fLyrics[stanza-1].fKind & VLSyllable::kHasPrev)
) { ) {
@ -1316,7 +1318,10 @@ bool VLSong::NextWord(size_t stanza, size_t & measure, VLFraction & at)
VLFraction now(0); VLFraction now(0);
while (note != meas.fMelody.end()) { while (note != meas.fMelody.end()) {
if (note->fPitch != VLNote::kNoPitch && (!firstMeasure || now>at)) if (!(note->fTied & VLNote::kTiedWithPrev)
&& note->fPitch != VLNote::kNoPitch
&& (!firstMeasure || now>at)
)
if (note->fLyrics.size() < stanza if (note->fLyrics.size() < stanza
|| !(note->fLyrics[stanza-1].fKind & VLSyllable::kHasPrev) || !(note->fLyrics[stanza-1].fKind & VLSyllable::kHasPrev)
) { ) {