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

Fix coda handling

Browse Source
This commit is contained in:
Matthias Neeracher 2008-04-05 18:58:42 +00:00
parent f9df0535de
commit 2ebcea7fd0
1 changed files with 13 additions and 3 deletions

16
Sources/VLModel.cpp
View File

@ -997,7 +997,7 @@ static const uint8_t * sDiv4[] = {
NULL, sDiv4_8, NULL, NULL, NULL, sDiv4_12}; NULL, sDiv4_8, NULL, NULL, NULL, sDiv4_12};
static const uint8_t sDiv6_2[] = {0, 0, 0, 1, 1, 1}; static const uint8_t sDiv6_2[] = {0, 0, 0, 1, 1, 1};
static const uint8_t sDiv6_3[] = {0, 0, 1, 1, 2, 2}; static const uint8_t sDiv6_3[] = {0, 0, 1, 2, 2, 2};
static const uint8_t sDiv6_4[] = {0, 1, 2, 2, 3, 3}; static const uint8_t sDiv6_4[] = {0, 1, 2, 2, 3, 3};
static const uint8_t sDiv6_8[] = {0, 2, 3, 4, 6, 7}; static const uint8_t sDiv6_8[] = {0, 2, 3, 4, 6, 7};
static const uint8_t sDiv6_12[]= {0, 2, 4, 6, 8,10}; static const uint8_t sDiv6_12[]= {0, 2, 4, 6, 8,10};
@ -1851,7 +1851,13 @@ VLSong::iterator::iterator(const VLSong & song, bool end)
if (end) { if (end) {
fMeasure = fSong.CountMeasures()-fSong.EmptyEnding(); fMeasure = fSong.CountMeasures()-fSong.EmptyEnding();
} else { } else {
bool repeat;
fMeasure = 0; fMeasure = 0;
if (fSong.fCoda > 0
&& !fSong.DoesEndRepeat(fMeasure)
&& !fSong.DoesEndEnding(fMeasure, &repeat)
)
fStatus.push_back(Repeat(fMeasure, 2));
AdjustStatus(); AdjustStatus();
} }
} }
@ -1868,7 +1874,7 @@ void VLSong::iterator::AdjustStatus()
{ {
int times; int times;
size_t volta; size_t volta;
bool repeat; bool repeat = true;
if (fSong.DoesEndRepeat(fMeasure) if (fSong.DoesEndRepeat(fMeasure)
|| (fSong.DoesEndEnding(fMeasure, &repeat) && repeat) || (fSong.DoesEndEnding(fMeasure, &repeat) && repeat)
) { ) {
@ -1880,6 +1886,8 @@ void VLSong::iterator::AdjustStatus()
return; return;
} }
} else if (!repeat) {
fStatus.pop_back();
} }
if (fSong.fCoda > 0 && fMeasure==fSong.fGoToCoda) if (fSong.fCoda > 0 && fMeasure==fSong.fGoToCoda)
if (fStatus.size() && fStatus.back().fVolta == fStatus.back().fTimes-1) { if (fStatus.size() && fStatus.back().fVolta == fStatus.back().fTimes-1) {
@ -1887,7 +1895,9 @@ void VLSong::iterator::AdjustStatus()
return; return;
} }
if (fMeasure == fSong.CountMeasures()-fSong.EmptyEnding()) if (fMeasure == fSong.CountMeasures()-fSong.EmptyEnding()
|| (fSong.fCoda > 0 && fMeasure == fSong.fCoda)
)
while (fStatus.size()) while (fStatus.size())
if (++fStatus.back().fVolta < fStatus.back().fTimes) { if (++fStatus.back().fVolta < fStatus.back().fTimes) {
fMeasure = fStatus.back().fBegin; fMeasure = fStatus.back().fBegin;