diff --git a/source/audio.cpp b/source/audio.cpp index b52493c..248bc93 100644 --- a/source/audio.cpp +++ b/source/audio.cpp @@ -97,7 +97,7 @@ InitAudio () { #ifdef NO_SOUND AUDIO_Init (NULL); - AUDIO_SetDSPSampleRate(AI_SAMPLERATE_32KHZ); + AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ); AUDIO_RegisterDMACallback(GCMixSamples); #else ASND_Init(); @@ -122,7 +122,6 @@ SwitchAudioMode(int mode) AUDIO_StopDMA(); AUDIO_RegisterDMACallback(NULL); DSP_Halt(); - AUDIO_SetDSPSampleRate(AI_SAMPLERATE_32KHZ); AUDIO_RegisterDMACallback(GCMixSamples); #endif memset(soundbuffer[0],0,AUDIOBUFFER); diff --git a/source/preferences.cpp b/source/preferences.cpp index 2ab9388..d4dbc22 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -474,15 +474,15 @@ DefaultSettings () Settings.DontSaveOopsSnapshot = true; Settings.ApplyCheats = true; - Settings.BlockInvalidVRAMAccess = false; Settings.HDMATimingHack = 100; + Settings.BlockInvalidVRAMAccessMaster = true; // Sound defaults. On Wii this is 32Khz/16bit/Stereo Settings.SoundSync = true; Settings.SixteenBitSound = true; Settings.Stereo = true; Settings.ReverseStereo = true; - Settings.SoundPlaybackRate = 32040; + Settings.SoundPlaybackRate = 48000; Settings.SoundInputRate = 32000; Settings.DynamicRateControl = true; diff --git a/source/snes9xgx.cpp b/source/snes9xgx.cpp index 1b5ae91..fb45f1b 100644 --- a/source/snes9xgx.cpp +++ b/source/snes9xgx.cpp @@ -378,7 +378,7 @@ void InitializeSnes9x() { if (!S9xInitAPU ()) ExitApp(); - S9xInitSound (64, 0); // Initialise Sound System + S9xInitSound (32, 0); // Initialise Sound System // Initialise Graphics setGFX ();