release r2, update credits

[fceu.git] / sound.h

diff --git a/sound.h b/sound.h
index c8d2618..7a21d41 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -37,14 +37,11 @@ typedef struct {
 extern EXPSOUND GameExpSound;
 
 //extern int64 nesincsizeLL;
-extern int64 nesincsize;
-extern uint8 PSG[];
+extern int32 nesincsize;
+extern uint8 PSG[0x18];
 extern uint32 PSG_base;
-extern int32 PCMIRQCount;
 
 void SetSoundVariables(void);
-void PowerSound(void);
-void ResetSound(void);
 extern uint8 decvolume[];
 
 extern int vdis;
@@ -53,10 +50,6 @@ extern uint16 nreg;
 
 extern uint8 trimode;
 extern uint8 tricoop;
-extern uint8 PCMBitIndex;
-extern uint32 PCMAddressIndex;
-extern int32 PCMSizeIndex;
-extern uint8 PCMBuffer;
 
 extern uint8 sweepon[2];
 extern int32 curfreq[2];
@@ -72,9 +65,9 @@ uint8 FCEU_GetJoyJoy(void);
 
 int GetSoundBuffer(int16 **W);
 int FlushEmulateSound(void);
-extern uint32 Wave[2048];
-extern int32 WaveFinal[2048];
-extern int16 WaveFinalMono[2048];
+extern uint32 Wave[2048+512];
+extern int16 WaveFinalMono[2048+512];
+extern int32 WaveHi[];
 extern uint32 soundtsinc;
 
 extern uint32 soundtsoffs;
@@ -84,5 +77,10 @@ void SetNESSoundMap(void);
 void FrameSoundUpdate(void);
 void FixOldSaveStateSFreq(void);
 
-DECLFW(Write_IRQFM);
+void FCEUSND_Power(void);
+void FCEUSND_Reset(void);
+void FCEUSND_SaveState(void);
+void FCEUSND_LoadState(int version);
 
+void FCEU_SoundCPUHook(int cycles48);
+DECLFW(Write_IRQFM);