diff --git a/src/win32/DirectSound.cpp b/src/win32/DirectSound.cpp index 55f759b7..aaa9bd18 100644 --- a/src/win32/DirectSound.cpp +++ b/src/win32/DirectSound.cpp @@ -182,21 +182,19 @@ bool DirectSound::init() } - if( !theApp.useOldSync ) { - if( SUCCEEDED( hr = dsbSecondary->QueryInterface( IID_IDirectSoundNotify8, (LPVOID*)&dsbNotify ) ) ) { - dsbEvent = CreateEvent( NULL, FALSE, FALSE, NULL ); - DSBPOSITIONNOTIFY notify[10]; - for( i = 0; i < 10; i++ ) { - notify[i].dwOffset = i * soundBufferLen; - notify[i].hEventNotify = dsbEvent; - } + if( SUCCEEDED( hr = dsbSecondary->QueryInterface( IID_IDirectSoundNotify8, (LPVOID*)&dsbNotify ) ) ) { + dsbEvent = CreateEvent( NULL, FALSE, FALSE, NULL ); + DSBPOSITIONNOTIFY notify[10]; + for( i = 0; i < 10; i++ ) { + notify[i].dwOffset = i * soundBufferLen; + notify[i].hEventNotify = dsbEvent; + } - if( FAILED( dsbNotify->SetNotificationPositions( 10, notify ) ) ) { - dsbNotify->Release(); - dsbNotify = NULL; - CloseHandle(dsbEvent); - dsbEvent = NULL; - } + if( FAILED( dsbNotify->SetNotificationPositions( 10, notify ) ) ) { + dsbNotify->Release(); + dsbNotify = NULL; + CloseHandle(dsbEvent); + dsbEvent = NULL; } } diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp index 82a0d16b..bb530b51 100644 --- a/src/win32/MainWnd.cpp +++ b/src/win32/MainWnd.cpp @@ -236,8 +236,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_MUTE, OnUpdateOptionsSoundMute) ON_COMMAND(ID_OPTIONS_SOUND_ON, OnOptionsSoundOn) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ON, OnUpdateOptionsSoundOn) - ON_COMMAND(ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION, OnOptionsSoundUseoldsynchronization) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION, OnUpdateOptionsSoundUseoldsynchronization) ON_COMMAND(ID_OPTIONS_SOUND_ECHO, OnOptionsSoundEcho) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ECHO, OnUpdateOptionsSoundEcho) ON_COMMAND(ID_OPTIONS_SOUND_LOWPASSFILTER, OnOptionsSoundLowpassfilter) diff --git a/src/win32/MainWnd.h b/src/win32/MainWnd.h index 4b4fe999..581fc799 100644 --- a/src/win32/MainWnd.h +++ b/src/win32/MainWnd.h @@ -273,8 +273,6 @@ class MainWnd : public CWnd afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundOn(); afx_msg void OnUpdateOptionsSoundOn(CCmdUI* pCmdUI); - afx_msg void OnOptionsSoundUseoldsynchronization(); - afx_msg void OnUpdateOptionsSoundUseoldsynchronization(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundEcho(); afx_msg void OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundLowpassfilter(); diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index c0925ec4..99b477c4 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -1006,18 +1006,6 @@ void MainWnd::OnUpdateOptionsSoundOn(CCmdUI* pCmdUI) pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording); } -void MainWnd::OnOptionsSoundUseoldsynchronization() -{ - theApp.useOldSync = !theApp.useOldSync; - systemMessage(IDS_SETTING_WILL_BE_EFFECTIVE, - "Setting will be effective the next time you start the emulator"); -} - -void MainWnd::OnUpdateOptionsSoundUseoldsynchronization(CCmdUI* pCmdUI) -{ - pCmdUI->SetCheck(theApp.useOldSync); -} - void MainWnd::OnOptionsSoundEcho() { soundEcho = !soundEcho; diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index 7868c8c7..579fb3e7 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -297,7 +297,6 @@ VBA::VBA() regEnabled = false; pauseWhenInactive = true; speedupToggle = false; - useOldSync = false; winGbPrinterEnabled = false; threadPriority = 2; disableMMX = false; @@ -1564,9 +1563,6 @@ void VBA::loadSettings() pauseWhenInactive = regQueryDwordValue("pauseWhenInactive", 1) ? true : false; - useOldSync = regQueryDwordValue("useOldSync", 0) ? - TRUE : FALSE; - captureFormat = regQueryDwordValue("captureFormat", 0); removeIntros = regQueryDwordValue("removeIntros", false) ? true : false; @@ -2636,8 +2632,6 @@ void VBA::saveSettings() regSetDwordValue("pauseWhenInactive", pauseWhenInactive); - regSetDwordValue("useOldSync", useOldSync); - regSetDwordValue("captureFormat", captureFormat); regSetDwordValue("removeIntros", removeIntros); diff --git a/src/win32/VBA.h b/src/win32/VBA.h index b02e58de..a337ecbd 100644 --- a/src/win32/VBA.h +++ b/src/win32/VBA.h @@ -172,7 +172,6 @@ class VBA : public CWinApp int skinButtons; bool pauseWhenInactive; bool speedupToggle; - bool useOldSync; bool winGbPrinterEnabled; int threadPriority; bool disableMMX; diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 2f042592..dfb9d997 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1706,7 +1706,6 @@ BEGIN POPUP "Output API" BEGIN MENUITEM "DirectSound", ID_OUTPUTAPI_DIRECTSOUND - MENUITEM " Use &old synchronization", ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION MENUITEM SEPARATOR MENUITEM "OpenAL", ID_OUTPUTAPI_OPENAL MENUITEM " Configuration...", ID_OUTPUTAPI_OALCONFIGURATION diff --git a/src/win32/resource.h b/src/win32/resource.h index 9f72277c..25d69d82 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -633,7 +633,6 @@ #define ID_OPTIONS_VIDEO_LAYERS_WIN1 40133 #define ID_OPTIONS_VIDEO_LAYERS_OBJWIN 40134 #define ID_FILE_OPENGAMEBOY 40135 -#define ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION 40136 #define ID_DEBUG_NEXTFRAME 40137 #define ID_TOOLS_MAPVIEW 40138 #define ID_TOOLS_PALETTEVIEW 40139