merge x6502 code FCEUX

[fceu.git] / sound.h

diff --git a/sound.h b/sound.h
index 142d504..90a534d 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -42,9 +42,7 @@ extern uint8 PSG[0x18];
 extern uint32 PSG_base;
 extern int32 PCMIRQCount;
 
-extern void (*SetSoundVariables)(void);
-
-void SetSoundVariables081(void);
+void SetSoundVariables(void);
 void PowerSound(void);
 void ResetSound(void);
 extern uint8 decvolume[];
@@ -76,6 +74,7 @@ int GetSoundBuffer(int16 **W);
 int FlushEmulateSound(void);
 extern uint32 Wave[2048+512];
 extern int16 WaveFinalMono[2048+512];
+extern int32 WaveHi[];
 extern uint32 soundtsinc;
 
 extern uint32 soundtsoffs;
@@ -85,3 +84,5 @@ void SetNESSoundMap(void);
 void FrameSoundUpdate(void);
 void FixOldSaveStateSFreq(void);
 
+void FCEU_SoundCPUHook(int cycles48);
+DECLFW(Write_IRQFM);