notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed 64bit stuff in sound.c
[fceu.git]
/
sound.c
diff --git
a/sound.c
b/sound.c
index
76f85a0
..
9bbda3f
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-25,7
+25,7
@@
/******* routines. A few ideas were inspired */
/******* by code from Marat Fayzullin's EMUlib */
/******* */
/******* routines. A few ideas were inspired */
/******* by code from Marat Fayzullin's EMUlib */
/******* */
-/********************************************************/
+/********************************************************/
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
@@
-44,6
+44,7
@@
uint32 soundtsi;
uint32 Wave[2048];
int32 WaveFinal[2048];
uint32 Wave[2048];
int32 WaveFinal[2048];
+int16 WaveFinalMono[2048];
EXPSOUND GameExpSound={0,0,0};
EXPSOUND GameExpSound={0,0,0};
@@
-55,13
+56,17
@@
uint8 decvolume[3];
uint8 realvolume[3];
static int32 count[5];
uint8 realvolume[3];
static int32 count[5];
-static int
64
sqacc[2]={0,0};
+static int
32
sqacc[2]={0,0};
uint8 sqnon=0;
uint8 sqnon=0;
+uint32 soundtsoffs=0;
+
#undef printf
uint16 nreg;
#undef printf
uint16 nreg;
-
-int32 lengthcount[4];
+
+int32 lengthcount[4];
+
+extern int soundvol;
static const uint8 Slengthtable[0x20]=
{
static const uint8 Slengthtable[0x20]=
{
@@
-77,7
+82,8
@@
static const uint32 SNoiseFreqTable[0x10]=
};
static uint32 NoiseFreqTable[0x10];
};
static uint32 NoiseFreqTable[0x10];
-int64 nesincsizeLL;
+static int32 nesincsize32;
+int64 nesincsize;
static const uint8 NTSCPCMTable[0x10]=
{
static const uint8 NTSCPCMTable[0x10]=
{
@@
-99,13
+105,13
@@
uint32 PSG_base;
// $4013 - Size register: Size in bytes = (V+1)*64
// $4013 - Size register: Size in bytes = (V+1)*64
-static int
64
PCMacc=0;
+static int
32
PCMacc=0;
static int PCMfreq;
int32 PCMIRQCount;
uint8 PCMBitIndex=0;
uint32 PCMAddressIndex=0;
int32 PCMSizeIndex=0;
static int PCMfreq;
int32 PCMIRQCount;
uint8 PCMBitIndex=0;
uint32 PCMAddressIndex=0;
int32 PCMSizeIndex=0;
-uint8 PCMBuffer=0;
+uint8 PCMBuffer=0;
int vdis=0;
static void Dummyfunc(void) {};
int vdis=0;
static void Dummyfunc(void) {};
@@
-128,9
+134,9
@@
static void CalcDPCMIRQ(void)
freq=(NTSCPCMTable[PSG[0x10]&0xF]<<4);
cycles=(((PSG[0x13]<<4)+1));
freq=(NTSCPCMTable[PSG[0x10]&0xF]<<4);
cycles=(((PSG[0x13]<<4)+1));
- cycles*=freq/14;
+ cycles*=freq/14;
honk=((PSG[0x13]<<4)+1)*freq;
honk=((PSG[0x13]<<4)+1)*freq;
- honk-=cycles;
+ honk-=cycles;
//if(PAL) honk/=107;
//else honk/=(double)113.66666666;
PCMIRQCount=honk*48;
//if(PAL) honk/=107;
//else honk/=(double)113.66666666;
PCMIRQCount=honk*48;
@@
-141,15
+147,15
@@
static void CalcDPCMIRQ(void)
static void PrepDPCM()
{
static void PrepDPCM()
{
- PCMAddressIndex=0x4000+(PSG[0x12]<<6);
+ PCMAddressIndex=0x4000+(PSG[0x12]<<6);
PCMSizeIndex=(PSG[0x13]<<4)+1;
PCMSizeIndex=(PSG[0x13]<<4)+1;
- PCMBitIndex=0;
+ PCMBitIndex=0;
//PCMBuffer=ARead[0x8000+PCMAddressIndex](0x8000+PCMAddressIndex);
if(PAL)
PCMfreq=PALPCMTable[PSG[0x10]&0xF];
else
PCMfreq=NTSCPCMTable[PSG[0x10]&0xF];
//PCMBuffer=ARead[0x8000+PCMAddressIndex](0x8000+PCMAddressIndex);
if(PAL)
PCMfreq=PALPCMTable[PSG[0x10]&0xF];
else
PCMfreq=NTSCPCMTable[PSG[0x10]&0xF];
- PCMacc=
(int64)PCMfreq<<50
;
+ PCMacc=
PCMfreq<<18
;
}
uint8 sweepon[2]={0,0};
}
uint8 sweepon[2]={0,0};
@@
-191,7
+197,7
@@
static uint8 DutyCount[2]={0,0};
static DECLFW(Write_PSG)
{
//if((A>=0x4004 && A<=0x4007) || A==0x4015)
static DECLFW(Write_PSG)
{
//if((A>=0x4004 && A<=0x4007) || A==0x4015)
- //printf("$%04x:$%02x, %d\n",A,V,
timestamp
);
+ //printf("$%04x:$%02x, %d\n",A,V,
SOUNDTS
);
A&=0x1f;
switch(A)
{
A&=0x1f;
switch(A)
{
@@
-208,12
+214,12
@@
static DECLFW(Write_PSG)
curfreq[0]&=0xFF00;
curfreq[0]|=V;
break;
curfreq[0]&=0xFF00;
curfreq[0]|=V;
break;
- case 0x3:
+ case 0x3:
if(PSG[0x15]&1)
{
DoSQ1();
lengthcount[0]=lengthtable[(V>>3)&0x1f];
if(PSG[0x15]&1)
{
DoSQ1();
lengthcount[0]=lengthtable[(V>>3)&0x1f];
- sqnon|=1;
+ sqnon|=1;
}
sweepon[0]=PSG[1]&0x80;
curfreq[0]=PSG[0x2]|((V&7)<<8);
}
sweepon[0]=PSG[1]&0x80;
curfreq[0]=PSG[0x2]|((V&7)<<8);
@@
-221,10
+227,10
@@
static DECLFW(Write_PSG)
DecCountTo1[0]=(PSG[0]&0xF)+1;
SweepCount[0]=((PSG[0x1]>>4)&7)+1;
DutyCount[0]=0;
DecCountTo1[0]=(PSG[0]&0xF)+1;
SweepCount[0]=((PSG[0x1]>>4)&7)+1;
DutyCount[0]=0;
- sqacc[0]=((int
64)curfreq[0]+1)<<50
;
+ sqacc[0]=((int
32)curfreq[0]+1)<<18
;
break;
break;
- case 0x4:
+ case 0x4:
DoSQ2();
if(V&0x10)
realvolume[1]=V&0xF;
DoSQ2();
if(V&0x10)
realvolume[1]=V&0xF;
@@
-237,7
+243,7
@@
static DECLFW(Write_PSG)
curfreq[1]&=0xFF00;
curfreq[1]|=V;
break;
curfreq[1]&=0xFF00;
curfreq[1]|=V;
break;
- case 0x7:
+ case 0x7:
if(PSG[0x15]&2)
{
DoSQ2();
if(PSG[0x15]&2)
{
DoSQ2();
@@
-245,14
+251,14
@@
static DECLFW(Write_PSG)
sqnon|=2;
}
sweepon[1]=PSG[0x5]&0x80;
sqnon|=2;
}
sweepon[1]=PSG[0x5]&0x80;
- curfreq[1]=PSG[0x6]|((V&7)<<8);
+ curfreq[1]=PSG[0x6]|((V&7)<<8);
decvolume[1]=0xF;
DecCountTo1[1]=(PSG[0x4]&0xF)+1;
SweepCount[1]=((PSG[0x5]>>4)&7)+1;
DutyCount[1]=0;
decvolume[1]=0xF;
DecCountTo1[1]=(PSG[0x4]&0xF)+1;
SweepCount[1]=((PSG[0x5]>>4)&7)+1;
DutyCount[1]=0;
- sqacc[1]=((int
64)curfreq[1]+1)<<50
;
+ sqacc[1]=((int
32)curfreq[1]+1)<<18
;
break;
break;
- case 0x8:
+ case 0x8:
DoTriangle();
if(laster&0x80)
{
DoTriangle();
if(laster&0x80)
{
@@
-289,13
+295,13
@@
static DECLFW(Write_PSG)
lengthcount[3]=lengthtable[(V>>3)&0x1f];
}
decvolume[2]=0xF;
lengthcount[3]=lengthtable[(V>>3)&0x1f];
}
decvolume[2]=0xF;
- DecCountTo1[2]=(PSG[0xC]&0xF)+1;
+ DecCountTo1[2]=(PSG[0xC]&0xF)+1;
break;
case 0x10:DoPCM();
if(!(V&0x80))
X6502_IRQEnd(FCEU_IQDPCM);
break;
break;
case 0x10:DoPCM();
if(!(V&0x80))
X6502_IRQEnd(FCEU_IQDPCM);
break;
- case 0x15:
+ case 0x15:
{
int t=V^PSG[0x15];
{
int t=V^PSG[0x15];
@@
-325,15
+331,6
@@
static DECLFW(Write_PSG)
X6502_IRQEnd(FCEU_IQDPCM);
}
break;
X6502_IRQEnd(FCEU_IQDPCM);
}
break;
- case 0x17:
- V&=0xC0;
- fcnt=0;
- if(V&0x80)
- FrameSoundUpdate();
- fhcnt=fhinc;
- X6502_IRQEnd(FCEU_IQFCOUNT);
- SIRQStat&=~0x40;
- break;
}
PSG[A]=V;
}
}
PSG[A]=V;
}
@@
-381,7
+378,7
@@
static void FASTAPASS(1) FrameSoundStuff(int V)
DoTriangle();
sqnon&=~4;
}
DoTriangle();
sqnon&=~4;
}
- }
+ }
}
for(P=0;P<2;P++)
}
for(P=0;P<2;P++)
@@
-392,7
+389,7
@@
static void FASTAPASS(1) FrameSoundStuff(int V)
{
if(lengthcount[P]>0)
{
{
if(lengthcount[P]>0)
{
- lengthcount[P]--;
+ lengthcount[P]--;
if(lengthcount[P]<=0)
{
sqnon&=~(P+1);
if(lengthcount[P]<=0)
{
sqnon&=~(P+1);
@@
-407,14
+404,14
@@
static void FASTAPASS(1) FrameSoundStuff(int V)
{
int32 mod=0;
{
int32 mod=0;
- if(SweepCount[P]>0) SweepCount[P]--;
+ if(SweepCount[P]>0) SweepCount[P]--;
if(SweepCount[P]<=0)
{
SweepCount[P]=((PSG[(P<<2)+0x1]>>4)&7)+1; //+1;
{
if(PSG[(P<<2)+0x1]&0x8)
{
if(SweepCount[P]<=0)
{
SweepCount[P]=((PSG[(P<<2)+0x1]>>4)&7)+1; //+1;
{
if(PSG[(P<<2)+0x1]&0x8)
{
- mod-=(P^1)+((curfreq[P])>>(PSG[(P<<2)+0x1]&7));
+ mod-=(P^1)+((curfreq[P])>>(PSG[(P<<2)+0x1]&7));
if(curfreq[P] && (PSG[(P<<2)+0x1]&7)/* && sweepon[P]&0x80*/)
{
if(curfreq[P] && (PSG[(P<<2)+0x1]&7)/* && sweepon[P]&0x80*/)
{
@@
-439,7
+436,7
@@
static void FASTAPASS(1) FrameSoundStuff(int V)
}
}
}
}
}
}
- }
+ }
}
if(PSG[0x15]&0x8 && sqnon&8)
}
if(PSG[0x15]&0x8 && sqnon&8)
@@
-459,7
+456,7
@@
static void FASTAPASS(1) FrameSoundStuff(int V)
case 0: /* Envelope decay + linear counter */
if(!trimode)
case 0: /* Envelope decay + linear counter */
if(!trimode)
- {
+ {
laster=0;
if(tricoop)
{
laster=0;
if(tricoop)
{
@@
-562,22
+559,22
@@
static void RDoPCM(void)
{
int32 V;
int32 start,end;
{
int32 V;
int32 start,end;
- int
64
freq;
+ int
32
freq;
uint32 out=PSG[0x11]<<3;
start=ChannelBC[4];
uint32 out=PSG[0x11]<<3;
start=ChannelBC[4];
- end=(
timestamp<<16)/soundtsinc;
+ end=(
SOUNDTS<<16)/soundtsinc;
if(end<=start) return;
ChannelBC[4]=end;
if(PSG[0x15]&0x10)
{
freq=PCMfreq;
if(end<=start) return;
ChannelBC[4]=end;
if(PSG[0x15]&0x10)
{
freq=PCMfreq;
- freq<<=
50
;
+ freq<<=
18
;
for(V=start;V<end;V++)
{
for(V=start;V<end;V++)
{
- PCMacc-=nesincsize
LL
;
+ PCMacc-=nesincsize
32
;
if(PCMacc<=0)
{
if(!PCMBitIndex)
if(PCMacc<=0)
{
if(!PCMBitIndex)
@@
-642,11
+639,11
@@
static void RDoSQ1(void)
{
int32 V;
int32 start,end;
{
int32 V;
int32 start,end;
- int
64
freq;
+ int
32
freq;
CalcRectAmp(0);
start=ChannelBC[0];
CalcRectAmp(0);
start=ChannelBC[0];
- end=(
timestamp
<<16)/soundtsinc;
+ end=(
SOUNDTS
<<16)/soundtsinc;
if(end<=start) return;
ChannelBC[0]=end;
if(end<=start) return;
ChannelBC[0]=end;
@@
-660,11
+657,11
@@
static void RDoSQ1(void)
uint32 out=RectAmp[0][DutyCount[0]];
freq=curfreq[0]+1;
{
uint32 out=RectAmp[0][DutyCount[0]];
freq=curfreq[0]+1;
{
- freq<<=
50
;
+ freq<<=
18
;
for(V=start;V<end;V++)
{
Wave[V>>4]+=out;
for(V=start;V<end;V++)
{
Wave[V>>4]+=out;
- sqacc[0]-=nesincsize
LL
;
+ sqacc[0]-=nesincsize
32
;
if(sqacc[0]<=0)
{
rea:
if(sqacc[0]<=0)
{
rea:
@@
-685,11
+682,11
@@
static void RDoSQ2(void)
{
int32 V;
int32 start,end;
{
int32 V;
int32 start,end;
- int
64
freq;
+ int
32
freq;
CalcRectAmp(1);
start=ChannelBC[1];
CalcRectAmp(1);
start=ChannelBC[1];
- end=(
timestamp
<<16)/soundtsinc;
+ end=(
SOUNDTS
<<16)/soundtsinc;
if(end<=start) return;
ChannelBC[1]=end;
if(end<=start) return;
ChannelBC[1]=end;
@@
-704,11
+701,11
@@
static void RDoSQ2(void)
freq=curfreq[1]+1;
{
freq=curfreq[1]+1;
{
- freq<<=
50
;
+ freq<<=
18
;
for(V=start;V<end;V++)
{
Wave[V>>4]+=out;
for(V=start;V<end;V++)
{
Wave[V>>4]+=out;
- sqacc[1]-=nesincsize
LL
;
+ sqacc[1]-=nesincsize
32
;
if(sqacc[1]<=0)
{
rea:
if(sqacc[1]<=0)
{
rea:
@@
-719,7
+716,6
@@
static void RDoSQ2(void)
DutyCount[1]&=7;
out=RectAmp[1][DutyCount[1]];
}
DutyCount[1]&=7;
out=RectAmp[1][DutyCount[1]];
}
-
}
}
}
}
}
}
@@
-731,10
+727,10
@@
static void RDoTriangle(void)
static uint32 tcout=0;
int32 V;
int32 start,end; //,freq;
static uint32 tcout=0;
int32 V;
int32 start,end; //,freq;
- int
64
freq=(((PSG[0xa]|((PSG[0xb]&7)<<8))+1));
+ int
32
freq=(((PSG[0xa]|((PSG[0xb]&7)<<8))+1));
start=ChannelBC[2];
start=ChannelBC[2];
- end=(
timestamp<<16)/soundtsinc;
+ end=(
SOUNDTS<<16)/soundtsinc;
if(end<=start) return;
ChannelBC[2]=end;
if(end<=start) return;
ChannelBC[2]=end;
@@
-757,13
+753,13
@@
static void RDoTriangle(void)
}
else
{
}
else
{
- static int
64 triacc=0;
- static uint8 tc=0;
+ static int
32 triacc=0;
+ static uint8 tc=0;
- freq<<=
49
;
+ freq<<=
17
;
for(V=start;V<end;V++)
{
for(V=start;V<end;V++)
{
- triacc-=nesincsize
LL
;
+ triacc-=nesincsize
32
;
if(triacc<=0)
{
rea:
if(triacc<=0)
{
rea:
@@
-786,7
+782,7
@@
static void RDoNoise(void)
int32 start,end;
start=ChannelBC[3];
int32 start,end;
start=ChannelBC[3];
- end=(
timestamp<<16)/soundtsinc;
+ end=(
SOUNDTS<<16)/soundtsinc;
if(end<=start) return;
ChannelBC[3]=end;
if(end<=start) return;
ChannelBC[3]=end;
@@
-795,27
+791,27
@@
static void RDoNoise(void)
uint32 outo;
uint32 amptab[2];
uint8 amplitude;
uint32 outo;
uint32 amptab[2];
uint8 amplitude;
-
+
amplitude=realvolume[2];
//if(PSG[0xC]&0x10)
// amplitude=(PSG[0xC]&0xF);
amplitude=realvolume[2];
//if(PSG[0xC]&0x10)
// amplitude=(PSG[0xC]&0xF);
- //else
+ //else
// amplitude=decvolume[2]&0xF;
// amplitude=decvolume[2]&0xF;
- inc=NoiseFreqTable[PSG[0xE]&0xF];
+ inc=NoiseFreqTable[PSG[0xE]&0xF];
amptab[0]=((amplitude<<2)+amplitude+amplitude)<<1;
amptab[1]=0;
outo=amptab[nreg&1];
amptab[0]=((amplitude<<2)+amplitude+amplitude)<<1;
amptab[1]=0;
outo=amptab[nreg&1];
- if(amplitude)
+ if(amplitude)
{
{
- if(PSG[0xE]&0x80) // "short" noise
+ if(PSG[0xE]&0x80) // "short" noise
for(V=start;V<end;V++)
for(V=start;V<end;V++)
- {
+ {
Wave[V>>4]+=outo;
if(count[3]>=inc)
Wave[V>>4]+=outo;
if(count[3]>=inc)
- {
- uint8 feedback;
+ {
+ uint8 feedback;
feedback=((nreg>>8)&1)^((nreg>>14)&1);
nreg=(nreg<<1)+feedback;
feedback=((nreg>>8)&1)^((nreg>>14)&1);
nreg=(nreg<<1)+feedback;
@@
-846,55
+842,70
@@
static void RDoNoise(void)
}
}
}
}
+DECLFW(Write_IRQFM)
+{
+ PSG[0x17]=V;
+ V=(V&0xC0)>>6;
+ fcnt=0;
+ if(V&0x2)
+ FrameSoundUpdate();
+ fcnt=1;
+ fhcnt=fhinc;
+ X6502_IRQEnd(FCEU_IQFCOUNT);
+ SIRQStat&=~0x40;
+ //IRQFrameMode=V; // IRQFrameMode is PSG[0x17] upper bits
+}
+
void SetNESSoundMap(void)
void SetNESSoundMap(void)
-{
+{
SetWriteHandler(0x4000,0x4013,Write_PSG);
SetWriteHandler(0x4011,0x4011,Write0x11);
SetWriteHandler(0x4015,0x4015,Write_PSG);
SetWriteHandler(0x4000,0x4013,Write_PSG);
SetWriteHandler(0x4011,0x4011,Write0x11);
SetWriteHandler(0x4015,0x4015,Write_PSG);
- SetWriteHandler(0x4017,0x4017,Write_
PSG);
+ SetWriteHandler(0x4017,0x4017,Write_
IRQFM);
SetReadHandler(0x4015,0x4015,Read_PSG);
}
SetReadHandler(0x4015,0x4015,Read_PSG);
}
-static int32 WaveNSF[2
56
];
+static int32 WaveNSF[2
048
];
-int
64
highp; // 0 through 65536, 0 = no high pass, 65536 = max high pass
+int
32
highp; // 0 through 65536, 0 = no high pass, 65536 = max high pass
-int
64
lowp; // 0 through 65536, 65536 = max low pass(total attenuation)
+int
32
lowp; // 0 through 65536, 65536 = max low pass(total attenuation)
// 65536 = no low pass
// 65536 = no low pass
-static void FilterSound(uint32 *in, int32 *out, int count)
+static void FilterSound(uint32 *in, int32 *out, int
16 *outMono, int
count)
{
{
- static int
64
acc=0, acc2=0;
+ static int
32
acc=0, acc2=0;
- for(;count;count--,in++,out++)
+ for(;count;count--,in++,out
Mono
++)
{
{
- int
64
diff;
+ int
32
diff;
- diff
=((int64)*in<<24)-
acc;
+ diff
= *in -
acc;
- acc
+=
(diff*highp)>>16;
- acc2+=
((diff-acc2)*lowp)>>16
;
+ acc
+=
(diff*highp)>>16;
+ acc2+=
(int32) (((int64)((diff-acc2)*lowp))>>16)
;
*in=0;
*in=0;
- *out=(acc2*(int64)FSettings.SoundVolume)>>(24+16);
- if(*out<-32767) *out=-32767;
- if(*out>32767) *out=32767;
- //*out=((int64)(acc2>>24)*(int64)FSettings.SoundVolume)>>16; //acc2>>24;
+
+ *outMono = (int16)acc2;
}
}
}
}
+
+
+static int32 inbuf=0;
int FlushEmulateSound(void)
{
int FlushEmulateSound(void)
{
- uint32 end;
int x;
int x;
+ uint32 end;
if(!timestamp) return(0);
if(!timestamp) return(0);
- if(!FSettings.SndRate)
+ if(!FSettings.SndRate
|| (soundvol == 0)
)
{
end=0;
goto nosoundo;
}
{
end=0;
goto nosoundo;
}
- end=(
timestamp
<<16)/soundtsinc;
+ end=(
SOUNDTS
<<16)/soundtsinc;
DoSQ1();
DoSQ2();
DoTriangle();
DoSQ1();
DoSQ2();
DoTriangle();
@@
-904,34
+915,37
@@
int FlushEmulateSound(void)
if(GameExpSound.Fill)
GameExpSound.Fill(end&0xF);
if(GameExpSound.Fill)
GameExpSound.Fill(end&0xF);
- FilterSound(Wave,WaveFinal,end>>4);
-
+// FilterSound(Wave,WaveFinal,end>>4);
+ FilterSound(Wave,WaveFinal,WaveFinalMono,end>>4);
+// printf("count %d, num ints %d\n", end, (end >> 4));
if(FCEUGameInfo.type==GIT_NSF)
{
if(FCEUGameInfo.type==GIT_NSF)
{
- int x
,s=0,si=end/1024; // Only want 1/4 of the output buffer to be displayed
- for(x=0;x<
256
;x++)
+ int x
;//,s=0,si=end/1024;
+ for(x=0;x<
1024
;x++)
{
{
- WaveNSF[x]=WaveFinal[s>>4];
- s+=si;
+ //WaveNSF[x]=WaveFinal[s>>4];
+ WaveNSF[x]=WaveFinalMono[x];
+ //s+=si;
}
}
if(end&0xF)
Wave[0]=Wave[(end>>4)];
}
}
if(end&0xF)
Wave[0]=Wave[(end>>4)];
- Wave[(end>>4)]=0;
+ Wave[(end>>4)]=0;
nosoundo:
for(x=0;x<5;x++)
ChannelBC[x]=end&0xF;
nosoundo:
for(x=0;x<5;x++)
ChannelBC[x]=end&0xF;
-
timestampbase+=timestamp
;
- timestamp=(soundtsinc*(end&0xF))>>16;
-
timestampbase-=timestamp
;
- return(end
>>4
);
+
soundtsoffs=(soundtsinc*(end&0xF))>>16
;
+ end>>=4;
+
inbuf=end
;
+ return(end);
}
}
-
void
GetSoundBuffer(int32 **W)
+
int
GetSoundBuffer(int32 **W)
{
*W=WaveNSF;
{
*W=WaveNSF;
+ return inbuf;
}
void PowerSound(void)
}
void PowerSound(void)
@@
-947,6
+961,7
@@
void PowerSound(void)
fhcnt=fhinc;
fcnt=0;
nreg=1;
fhcnt=fhinc;
fcnt=0;
nreg=1;
+ soundtsoffs=0;
}
void ResetSound(void)
}
void ResetSound(void)
@@
-962,7
+977,7
@@
void ResetSound(void)
void SetSoundVariables(void)
{
void SetSoundVariables(void)
{
- int x;
+ int x;
fhinc=PAL?16626:14915; // *2 CPU clock rate
fhinc*=24;
fhinc=PAL?16626:14915; // *2 CPU clock rate
fhinc*=24;
@@
-976,7
+991,7
@@
void SetSoundVariables(void)
DoPCM=RDoPCM;
DoSQ1=RDoSQ1;
DoSQ2=RDoSQ2;
DoPCM=RDoPCM;
DoSQ1=RDoSQ1;
DoSQ2=RDoSQ2;
- }
+ }
else
{
DoNoise=DoTriangle=DoPCM=DoSQ1=DoSQ2=Dummyfunc;
else
{
DoNoise=DoTriangle=DoPCM=DoSQ1=DoSQ2=Dummyfunc;
@@
-986,7
+1001,9
@@
void SetSoundVariables(void)
if(GameExpSound.RChange)
GameExpSound.RChange();
if(GameExpSound.RChange)
GameExpSound.RChange();
- nesincsizeLL=(int64)((int64)562949953421312*(long double)(PAL?PAL_CPU:NTSC_CPU)/(FSettings.SndRate OVERSAMPLE));
+ // nesincsizeLL=(int64)((int64)562949953421312*(double)(PAL?PAL_CPU:NTSC_CPU)/(FSettings.SndRate OVERSAMPLE));
+ nesincsize=(int64)(((int64)1<<17)*(double)(PAL?PAL_CPU:NTSC_CPU)/(FSettings.SndRate * 16));
+ nesincsize32=(int32)nesincsize;
PSG_base=(uint32)(PAL?(long double)PAL_CPU/16:(long double)NTSC_CPU/16);
for(x=0;x<0x10;x++)
PSG_base=(uint32)(PAL?(long double)PAL_CPU/16:(long double)NTSC_CPU/16);
for(x=0;x<0x10;x++)
@@
-1002,7
+1019,7
@@
void SetSoundVariables(void)
for(x=0;x<5;x++)
ChannelBC[x]=0;
highp=(250<<16)/FSettings.SndRate; // Arbitrary
for(x=0;x<5;x++)
ChannelBC[x]=0;
highp=(250<<16)/FSettings.SndRate; // Arbitrary
- lowp=(
(int64)
25000<<16)/FSettings.SndRate; // Arbitrary
+ lowp=(25000<<16)/FSettings.SndRate; // Arbitrary
if(highp>(1<<16)) highp=1<<16;
if(lowp>(1<<16)) lowp=1<<16;
if(highp>(1<<16)) highp=1<<16;
if(lowp>(1<<16)) lowp=1<<16;
@@
-1025,5
+1042,5
@@
void FCEUI_Sound(int Rate)
void FCEUI_SetSoundVolume(uint32 volume)
{
void FCEUI_SetSoundVolume(uint32 volume)
{
- FSettings.SoundVolume=
(volume<<16)/100
;
+ FSettings.SoundVolume=
volume
;
}
}