diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index 06216232..e3df7f08 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -1204,15 +1204,6 @@ BOOL MainWnd::OnOptionsSoundPcminterpolation(UINT nID) case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR: soundInterpolation = 1; break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_CUBIC: - soundInterpolation = 2; - break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_FIR: - soundInterpolation = 3; - break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_LIBRESAMPLE: - soundInterpolation = 4; - break; default: return FALSE; @@ -1231,15 +1222,6 @@ void MainWnd::OnUpdateOptionsSoundPcminterpolation(CCmdUI *pCmdUI) case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR: pCmdUI->SetCheck(soundInterpolation == 1); break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_CUBIC: - pCmdUI->SetCheck(soundInterpolation == 2); - break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_FIR: - pCmdUI->SetCheck(soundInterpolation == 3); - break; - case ID_OPTIONS_SOUND_PCMINTERPOLATION_LIBRESAMPLE: - pCmdUI->SetCheck(soundInterpolation == 4); - break; default: return; diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index 544d3604..361a744c 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -1459,7 +1459,7 @@ void VBA::loadSettings() soundVolume = 0; soundInterpolation = regQueryDwordValue("soundInterpolation", 0); - if(soundInterpolation < 0 || soundInterpolation > 4) + if(soundInterpolation < 0 || soundInterpolation > 1) soundInterpolation = 0; ddrawEmulationOnly = regQueryDwordValue("ddrawEmulationOnly", false) ? true : false; diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 4b0b1912..04d9d0b1 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1686,16 +1686,11 @@ BEGIN END POPUP "PCM interpolation" BEGIN - MENUITEM "None", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE - MENUITEM "Linear", ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR - MENUITEM "Cubic", ID_OPTIONS_SOUND_PCMINTERPOLATION_CUBIC - MENUITEM "FIR (Kaiser 4T)", ID_OPTIONS_SOUND_PCMINTERPOLATION_FIR - MENUITEM "libresample", ID_OPTIONS_SOUND_PCMINTERPOLATION_LIBRESAMPLE + MENUITEM "On", ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR + MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE END MENUITEM SEPARATOR MENUITEM "&Echo", ID_OPTIONS_SOUND_ECHO - MENUITEM "&Low pass filter", ID_OPTIONS_SOUND_LOWPASSFILTER - MENUITEM "&Reverse Stereo", ID_OPTIONS_SOUND_REVERSESTEREO MENUITEM SEPARATOR POPUP "Sound Channels" BEGIN