otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into inf2

Browse source
This commit is contained in:
tildearrow 2025-11-18 03:12:11 -05:00
commit 8f7fd0a229
8 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/engine/defines.h
View file

@ -39,8 +39,8 @@
#define DIV_PAT_FXVAL(_x) (4+((_x)<<1))
// column type checks
#define DIV_PAT_IS_EFFECT(_x) ((_x)>DIV_PAT_VOL && (!((_x)&1)))
#define DIV_PAT_IS_EFFECT_VAL(_x) ((_x)>DIV_PAT_VOL && ((_x)&1))
#define DIV_PAT_IS_EFFECT(_x) ((_x)>DIV_PAT_VOL && ((_x)&1))
#define DIV_PAT_IS_EFFECT_VAL(_x) ((_x)>DIV_PAT_VOL && (!((_x)&1)))
#define DIV_NOTE_NULL_PAT 252
#define DIV_NOTE_OFF 253

1
src/engine/legacySample.cpp
View file

@ -284,6 +284,7 @@ bool DivEngine::convertLegacySampleMode() {
continue;
}
sampleMode=1;
preferredInsType=DIV_INS_ADPCMB;
break;
case DIV_SYSTEM_Y8950_DRUMS:
// Y8950 ADPCM

5
src/engine/playback.cpp
View file

@ -2138,9 +2138,8 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
// advance tempo accumulator (for virtual tempo) unless we are step playing and waiting for the next step (stepPlay==2)
// then advance tick counter and then call nextRow()
if (stepPlay!=1) {
// fast-forward the accumulator if we are "skipping" (seeking to a position)
// otherwise increase accumulator by virtual tempo numerator
tempoAccum+=(skipping && virtualTempoN<virtualTempoD)?virtualTempoD:virtualTempoN;
// increase accumulator by virtual tempo numerator
tempoAccum+=virtualTempoN;
// while accumulator is higher than virtual tempo denominator
while (tempoAccum>=virtualTempoD) {
// wrap the accumulator back