LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: #299697: Repeat play a bar, goes back to first bar briefly

Browse source
This commit is contained in:
Jack Pearson 2020-02-08 14:06:00 -08:00
parent 89e776219a
commit 4199fb0190
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mscore/seq.cpp
View file

@ -836,8 +836,10 @@ void Seq::process(unsigned framesPerPeriod, float* buffer)
if (mscore->loop()) {
int loopOutUTick = cs->repeatList().tick2utick(cs->loopOutTick().ticks());
if (loopOutUTick < scoreEndUTick) {
// Also make sure we are not "before" the loop
if (playPosUTick >= loopOutUTick || cs->repeatList().utick2tick(playPosUTick) < cs->loopInTick().ticks()) {
qreal framesPerPeriodInTime = static_cast<qreal>(framesPerPeriod) / MScore::sampleRate;
int framesPerPeriodInTicks = cs->utime2utick(framesPerPeriodInTime);
// Also make sure we are inside the loop
if (playPosUTick >= loopOutUTick - 2 * framesPerPeriodInTicks || cs->repeatList().utick2tick(playPosUTick) < cs->loopInTick().ticks()) {
qDebug ("Process: playPosUTick = %d, cs->loopInTick().ticks() = %d, cs->loopOutTick().ticks() = %d, getCurTick() = %d, loopOutUTick = %d, playFrame = %d",
playPosUTick, cs->loopInTick().ticks(), cs->loopOutTick().ticks(), getCurTick(), loopOutUTick, *pPlayFrame);
if (cachedPrefs.useJackTransport) {
@ -849,7 +851,7 @@ void Seq::process(unsigned framesPerPeriod, float* buffer)
}
}
else {
emit toGui('3');
emit toGui('3'); // calls loopStart()
}
// Exit this function to avoid segmentation fault in Scoreview
return;
@ -1092,7 +1094,7 @@ void Seq::collectEvents(int utick)
}
updateEventsEnd();
playPos = events.cbegin();
playPos = mscore->loop() ? events.find(cs->loopInTick().ticks()) : events.cbegin();
playlistChanged = false;
mutex.unlock();
}