|
@@ -387,7 +387,7 @@ public: |
|
|
if (fLastPositionData.barBeat >= 0.0f) |
|
|
if (fLastPositionData.barBeat >= 0.0f) |
|
|
{ |
|
|
{ |
|
|
const double rest = std::fmod(fLastPositionData.barBeat, 1.0f); |
|
|
const double rest = std::fmod(fLastPositionData.barBeat, 1.0f); |
|
|
fTimePosition.bbt.beat = fLastPositionData.barBeat-rest+1.0; |
|
|
|
|
|
|
|
|
fTimePosition.bbt.beat = std::round(fLastPositionData.barBeat-rest+1.0); |
|
|
fTimePosition.bbt.tick = rest*fTimePosition.bbt.ticksPerBeat+0.5; |
|
|
fTimePosition.bbt.tick = rest*fTimePosition.bbt.ticksPerBeat+0.5; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@@ -580,7 +580,7 @@ public: |
|
|
(double)fLastPositionData.beatsPerBar); |
|
|
(double)fLastPositionData.beatsPerBar); |
|
|
|
|
|
|
|
|
const double rest = std::fmod(fLastPositionData.barBeat, 1.0f); |
|
|
const double rest = std::fmod(fLastPositionData.barBeat, 1.0f); |
|
|
fTimePosition.bbt.beat = fLastPositionData.barBeat-rest+1.0; |
|
|
|
|
|
|
|
|
fTimePosition.bbt.beat = std::round(fLastPositionData.barBeat-rest+1.0); |
|
|
fTimePosition.bbt.tick = rest*fTimePosition.bbt.ticksPerBeat+0.5; |
|
|
fTimePosition.bbt.tick = rest*fTimePosition.bbt.ticksPerBeat+0.5; |
|
|
|
|
|
|
|
|
if (fLastPositionData.bar >= 0) |
|
|
if (fLastPositionData.bar >= 0) |
|
|