win32: move sound sync to sound drivers

win32/CWaveOut.cpp

@@ -110,6 +110,11 @@ void CWaveOut::StopPlayback()
     waveOutPause(hWaveOut);
 }
 
+int CWaveOut::GetAvailableBytes()
+{
+    return ((blockCount - bufferCount) * singleBufferBytes) - partialOffset;
+}
+
 void CWaveOut::ProcessSound()
 {
     int freeBytes = ((blockCount - bufferCount) * singleBufferBytes) - partialOffset;
@@ -137,6 +142,22 @@ void CWaveOut::ProcessSound()
     if (!initDone)
         return;
 
+    if(Settings.SoundSync && !Settings.TurboMode && !Settings.Mute)
+    {
+        // no sound sync when speed is not set to 100%
+        while((freeBytes >> 1) < availableSamples)
+        {
+            ResetEvent(GUI.SoundSyncEvent);
+            if(!GUI.AllowSoundSync || WaitForSingleObject(GUI.SoundSyncEvent, 1000) != WAIT_OBJECT_0)
+            {
+                S9xClearSamples();
+                return;
+            }
+            freeBytes = GetAvailableBytes();
+        }
+    }
+
+
     if (partialOffset != 0) {
         UINT32 samplesleftinblock = (singleBufferBytes - partialOffset) >> 1;
         BYTE *offsetBuffer = (BYTE *)waveHeaders[writeOffset].lpData + partialOffset;

win32/CWaveOut.h

@@ -18,6 +18,7 @@ class CWaveOut : public IS9xSoundOutput
     void BeginPlayback(void);
     void StopPlayback(void);
     void ProcessSound(void);
+    int GetAvailableBytes();
 
     HWAVEOUT hWaveOut;
     bool initDone;

win32/CXAudio2.cpp

@@ -268,6 +268,11 @@ void CXAudio2::StopPlayback()
 	pSourceVoice->Stop(0);
 }
 
+int CXAudio2::GetAvailableBytes()
+{
+    return ((blockCount - bufferCount) * singleBufferBytes) - partialOffset;
+}
+
 /*  CXAudio2::ProcessSound
 The mixing function called by the sound core when new samples are available.
 SoundBuffer is divided into blockCount blocks. If there are enough available samples and a free block,
@@ -276,7 +281,7 @@ the OnBufferComplete callback.
 */
 void CXAudio2::ProcessSound()
 {
-	int freeBytes = ((blockCount - bufferCount) * singleBufferBytes) - partialOffset;
+	int freeBytes = GetAvailableBytes();
 
 	if (Settings.DynamicRateControl)
 	{
@@ -289,7 +294,7 @@ void CXAudio2::ProcessSound()
 
 	availableSamples = S9xGetSampleCount();
 
-	if (Settings.DynamicRateControl)
+	if (Settings.DynamicRateControl && !Settings.SoundSync)
 	{
 		// Using rate control, we should always keep the emulator's sound buffers empty to
 		// maintain an accurate measurement.
@@ -303,6 +308,21 @@ void CXAudio2::ProcessSound()
 	if(!initDone)
 		return;
 
+    if(Settings.SoundSync && !Settings.TurboMode && !Settings.Mute)
+    {
+        // no sound sync when speed is not set to 100%
+        while((freeBytes >> 1) < availableSamples)
+        {
+            ResetEvent(GUI.SoundSyncEvent);
+            if(!GUI.AllowSoundSync || WaitForSingleObject(GUI.SoundSyncEvent, 1000) != WAIT_OBJECT_0)
+            {
+                S9xClearSamples();
+                return;
+            }
+            freeBytes = GetAvailableBytes();
+        }
+    }
+
 	if (partialOffset != 0)	{
 		BYTE *offsetBuffer = soundBuffer + writeOffset + partialOffset;
 		UINT32 samplesleftinblock = (singleBufferBytes - partialOffset) >> 1;

win32/CXAudio2.h

@@ -40,6 +40,7 @@ private:
 	void ProcessSound(void);
 	bool InitXAudio2(void);
 	void DeInitXAudio2(void);
+    int GetAvailableBytes();
 
     std::vector<std::wstring> GetDeviceList();
     int FindDeviceIndex(TCHAR *audio_device);

win32/wconfig.cpp

@@ -117,6 +117,7 @@ void WinSetDefaultValues ()
 	Settings.TakeScreenshot=false;
 
 	GUI.Language=0;
+    GUI.AllowSoundSync = true;
 }
 
 

win32/wsnes9x.cpp

@@ -87,7 +87,6 @@ extern SNPServer NPServer;
 
 __int64 PCBase, PCFrameTime, PCFrameTimeNTSC, PCFrameTimePAL, PCStart, PCEnd;
 DWORD PCStartTicks, PCEndTicks;
-bool PCFrameTimeIsDefault = true;
 
 INT_PTR CALLBACK DlgSoundConf(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK DlgInfoProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -3455,13 +3454,6 @@ int WINAPI WinMain(
 
 			if(run_loop)
 			{
-                // no sound sync when speed is not set to 100%
-                while (!S9xSyncSound()) {
-                    ResetEvent(GUI.SoundSyncEvent);
-                    if (!PCFrameTimeIsDefault || WaitForSingleObject(GUI.SoundSyncEvent, 1000) != WAIT_OBJECT_0)
-                        S9xClearSamples();
-                }
-
 				ProcessInput();
 
                 if(GUI.rewindBufferSize
@@ -3901,12 +3893,15 @@ static void ResetFrameTimer ()
 {
     QueryPerformanceCounter((LARGE_INTEGER*)&PCStart);
 	PCStartTicks = timeGetTime()*1000;
-    if (Settings.FrameTime == Settings.FrameTimeNTSC) PCFrameTime = PCFrameTimeNTSC;
+    if (Settings.FrameTime == Settings.FrameTimeNTSC)
-    else if (Settings.FrameTime == Settings.FrameTimePAL) PCFrameTime = PCFrameTimePAL;
+        PCFrameTime = PCFrameTimeNTSC;
-    else PCFrameTime = (__int64)((double)(PCBase * Settings.FrameTime) * .000001);
+    else if (Settings.FrameTime == Settings.FrameTimePAL)
+        PCFrameTime = PCFrameTimePAL;
+    else
+        PCFrameTime = (__int64)((double)(PCBase * Settings.FrameTime) * .000001);
 
 	// determines if we can do sound sync
-	PCFrameTimeIsDefault = Settings.PAL ? Settings.FrameTime == Settings.FrameTimePAL : Settings.FrameTime == Settings.FrameTimeNTSC;
+	GUI.AllowSoundSync = Settings.PAL ? Settings.FrameTime == Settings.FrameTimePAL : Settings.FrameTime == Settings.FrameTimeNTSC;
 
     if (GUI.hFrameTimer)
         timeKillEvent (GUI.hFrameTimer);

win32/wsnes9x.h

@@ -217,6 +217,7 @@ struct sGUI {
 	CRITICAL_SECTION SoundCritSect;
     HANDLE SoundSyncEvent;
     TCHAR AudioDevice[MAX_AUDIO_NAME_LENGTH];
+    bool AllowSoundSync;
 
     TCHAR RomDir [_MAX_PATH];
     TCHAR ScreensDir [_MAX_PATH];