Unified · Split
| @@ -1275,12 +1275,22 @@ bool setupAudio(void) · 1274 unmodified lines | |||
| 1275 | 1275 | ||
| 1276 | calcAudioLatencyVars(audio.audioBufferSize, audio.outputRate); | 1276 | calcAudioLatencyVars(audio.audioBufferSize, audio.outputRate); |
| 1277 | 1277 | ||
| 1278 | audio.tickTimeLengthTab[0] = UINT64_MAX; | 1278 | for (int32_t i = 32; i <= 255; i++) |
| 1279 | const double dMul = (editor.dPerfFreq / audio.outputRate) * (UINT32_MAX + 1.0); | ||
| 1280 | for (int32_t i = 1; i < 256-32; i++) | ||
| 1281 | { | 1279 | { |
| 1280 | const double dBpmHz = i / 2.5; | ||
| 1281 | |||
| 1282 | // number of samples per tick -> tick length for performance counter (syncing visuals to audio) | 1282 | // number of samples per tick -> tick length for performance counter (syncing visuals to audio) |
| 1283 | audio.tickTimeLengthTab[i] = (uint64_t)(audio.bpmTab[i] * dMul); | 1283 | double dTimeInt; |
| 1284 | double dTimeFrac = modf(editor.dPerfFreq / dBpmHz, &dTimeInt); | ||
| 1285 | const int32_t timeInt = (int32_t)dTimeInt; | ||
| 1286 | |||
| 1287 | // fractional part (scaled to 0..2^32-1) | ||
| 1288 | dTimeFrac *= UINT32_MAX; | ||
| 1289 | dTimeFrac += 0.5; | ||
| 1290 | if (dTimeFrac > UINT32_MAX) | ||
| 1291 | dTimeFrac = UINT32_MAX; | ||
| 1292 | |||
| 1293 | audio.tickTimeLengthTab[i-32] = ((uint64_t)timeInt << 32) | (uint32_t)dTimeFrac; | ||
| 1284 | } | 1294 | } |
| 1285 | 1295 | ||
| 1286 | audio.resetSyncTickTimeFlag = true; | 1296 | audio.resetSyncTickTimeFlag = true; |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | |||
| 14 | #include "pt2_unicode.h" | 14 | #include "pt2_unicode.h" |
| 15 | #include "pt2_palette.h" | 15 | #include "pt2_palette.h" |
| 16 | 16 | ||
| 17 | #define PROG_VER_STR "1.21" | 17 | #define PROG_VER_STR "1.22" |
| 18 | 18 | ||
| 19 | #ifdef _WIN32 | 19 | #ifdef _WIN32 |
| 20 | #define DIR_DELIMITER '\\' | 20 | #define DIR_DELIMITER '\\' |