ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply patch and fix #639

This commit is contained in:
feos-tas 2016-06-05 09:35:27 +00:00
parent 84d100c56f
commit 9b092023f8
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/src/lua-engine.cpp
View File

@ -4304,7 +4304,8 @@ static int sound_get(lua_State *L)
extern uint8 PSG[0x10];
extern int32 lengthcount[4];
extern uint8 TriCount;
extern const uint32 *NoiseFreqTable;
extern const uint32 NoiseFreqTableNTSC[0x10];
extern const uint32 NoiseFreqTablePAL[0x10];
extern int32 DMCPeriod;
extern uint8 DMCAddressLatch, DMCSizeLatch;
extern uint8 DMCFormat;
@ -4313,6 +4314,7 @@ static int sound_get(lua_State *L)
int freqReg;
double freq;
bool shortMode;
lua_newtable(L);
@ -4337,7 +4339,7 @@ static int sound_get(lua_State *L)
else
lua_pushnumber(L, nesVolumes[0]);
lua_setfield(L, -2, "volume");
freq = (39375000.0/352.0) / (curfreq[0] + 1);
freq = ((PAL?PAL_CPU:NTSC_CPU)/16.0) / (curfreq[0] + 1);
lua_pushnumber(L, freq);
lua_setfield(L, -2, "frequency");
lua_pushnumber(L, (log(freq / 440.0) * 12 / log(2.0)) + 69);
@ -4358,7 +4360,7 @@ static int sound_get(lua_State *L)
else
lua_pushnumber(L, nesVolumes[1]);
lua_setfield(L, -2, "volume");
freq = (39375000.0/352.0) / (curfreq[1] + 1);
freq = ((PAL?PAL_CPU:NTSC_CPU)/16.0) / (curfreq[1] + 1);
lua_pushnumber(L, freq);
lua_setfield(L, -2, "frequency");
lua_pushnumber(L, (log(freq / 440.0) * 12 / log(2.0)) + 69);
@ -4378,7 +4380,7 @@ static int sound_get(lua_State *L)
lua_pushnumber(L, 1.0);
lua_setfield(L, -2, "volume");
freqReg = PSG[0xa] | ((PSG[0xb] & 7) << 8);
freq = (39375000.0/704.0) / (freqReg + 1);
freq = ((PAL?PAL_CPU:NTSC_CPU)/32.0) / (freqReg + 1);
lua_pushnumber(L, freq);
lua_setfield(L, -2, "frequency");
lua_pushnumber(L, (log(freq / 440.0) * 12 / log(2.0)) + 69);
@ -4396,9 +4398,12 @@ static int sound_get(lua_State *L)
lua_pushnumber(L, nesVolumes[2]);
lua_setfield(L, -2, "volume");
freqReg = PSG[0xE] & 0xF;
lua_pushboolean(L, (PSG[0xE] & 0x80) != 0);
shortMode = ((PSG[0xE] & 0x80) != 0);
lua_pushboolean(L, shortMode);
lua_setfield(L, -2, "short");
freq = (39375000.0/44.0) / NoiseFreqTable[freqReg]; // probably wrong
freq = PAL? PAL_CPU/NoiseFreqTablePAL[freqReg] : NTSC_CPU/NoiseFreqTableNTSC[freqReg] ; // rate
if(shortMode)
freq /= 93.0; // pitch
lua_pushnumber(L, freq);
lua_setfield(L, -2, "frequency");
lua_pushnumber(L, (log(freq / 440.0) * 12 / log(2.0)) + 69);
@ -4415,7 +4420,7 @@ static int sound_get(lua_State *L)
else
lua_pushnumber(L, 1.0);
lua_setfield(L, -2, "volume");
freq = (39375000.0/2.0) / DMCPeriod;
freq = (PAL?PAL_CPU:NTSC_CPU) / DMCPeriod; // rate
lua_pushnumber(L, freq);
lua_setfield(L, -2, "frequency");
lua_pushnumber(L, (log(freq / 440.0) * 12 / log(2.0)) + 69);

5
trunk/src/sound.cpp
View File

@ -91,19 +91,18 @@ static const uint8 lengthtable[0x20]=
};
static const uint32 NoiseFreqTableNTSC[0x10] =
extern const uint32 NoiseFreqTableNTSC[0x10] =
{
4, 8, 16, 32, 64, 96, 128, 160, 202,
254, 380, 508, 762, 1016, 2034, 4068
};
static const uint32 NoiseFreqTablePAL[0x10] =
extern const uint32 NoiseFreqTablePAL[0x10] =
{
4, 7, 14, 30, 60, 88, 118, 148, 188,
236, 354, 472, 708, 944, 1890, 3778
};
const uint32 *NoiseFreqTable = NoiseFreqTableNTSC; // for lua only
static const uint32 NTSCDMCTable[0x10]=
{