etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2025-01-05 07:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

YM2612: fix negative octaves

Browse source
This commit is contained in:
tildearrow 2022-04-24 22:45:59 -05:00
parent 52e35fdf04
commit c84ff399d9
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/engine/dispatch.h
View file

@ -426,7 +426,8 @@ class DivDispatch {
#define NOTE_PERIODIC(x) round(parent->calcBaseFreq(chipClock,CHIP_DIVIDER,x,true)) #define NOTE_PERIODIC(x) round(parent->calcBaseFreq(chipClock,CHIP_DIVIDER,x,true))
#define NOTE_PERIODIC_NOROUND(x) parent->calcBaseFreq(chipClock,CHIP_DIVIDER,x,true) #define NOTE_PERIODIC_NOROUND(x) parent->calcBaseFreq(chipClock,CHIP_DIVIDER,x,true)
#define NOTE_FREQUENCY(x) parent->calcBaseFreq(chipClock,CHIP_FREQBASE,x,false) #define NOTE_FREQUENCY(x) parent->calcBaseFreq(chipClock,CHIP_FREQBASE,x,false)
#define NOTE_FNUM_BLOCK(x,bits) ((((int)parent->calcBaseFreq(chipClock,CHIP_FREQBASE,(x)%12,false))&((1<<bits)-1))|((MAX(x,0)/12)<<bits))
#define NOTE_FNUM_BLOCK(x,bits) parent->calcBaseFreqFNumBlock(chipClock,CHIP_FREQBASE,x,bits)
#define COLOR_NTSC (315000000.0/88.0) #define COLOR_NTSC (315000000.0/88.0)
#define COLOR_PAL (283.75*15625.0+25.0) #define COLOR_PAL (283.75*15625.0+25.0)

11
src/engine/engine.cpp
View file

@ -887,6 +887,17 @@ double DivEngine::calcBaseFreq(double clock, double divider, int note, bool peri
base*(divider/clock); base*(divider/clock);
} }
unsigned short DivEngine::calcBaseFreqFNumBlock(double clock, double divider, int note, int bits) {
int bf=calcBaseFreq(clock,divider,note,false);
int block=note/12;
if (block<0) block=0;
if (block>7) block=7;
bf>>=block;
if (bf<0) bf=0;
if (bf>((1<<bits)-1)) bf=(1<<bits)-1;
return bf|(block<<bits);
}
int DivEngine::calcFreq(int base, int pitch, bool period, int octave) { int DivEngine::calcFreq(int base, int pitch, bool period, int octave) {
if (song.linearPitch) { if (song.linearPitch) {
// global pitch multiplier // global pitch multiplier

3
src/engine/engine.h
View file

@ -367,6 +367,9 @@ class DivEngine {
// calculate base frequency/period // calculate base frequency/period
double calcBaseFreq(double clock, double divider, int note, bool period); double calcBaseFreq(double clock, double divider, int note, bool period);
// calculate base frequency in f-num/block format
unsigned short calcBaseFreqFNumBlock(double clock, double divider, int note, int bits);
// calculate frequency/period // calculate frequency/period
int calcFreq(int base, int pitch, bool period=false, int octave=0); int calcFreq(int base, int pitch, bool period=false, int octave=0);