Cleaned up GUI of redundant options, due to implementation of new sound cores

This commit is contained in:
mudlord 2007-12-06 10:14:45 +00:00
parent f48ef9ddbb
commit 15c99f1fd6
3 changed files with 3 additions and 26 deletions

View File

@ -1204,15 +1204,6 @@ BOOL MainWnd::OnOptionsSoundPcminterpolation(UINT nID)
case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR: case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR:
soundInterpolation = 1; soundInterpolation = 1;
break; 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: default:
return FALSE; return FALSE;
@ -1231,15 +1222,6 @@ void MainWnd::OnUpdateOptionsSoundPcminterpolation(CCmdUI *pCmdUI)
case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR: case ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR:
pCmdUI->SetCheck(soundInterpolation == 1); pCmdUI->SetCheck(soundInterpolation == 1);
break; 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: default:
return; return;

View File

@ -1459,7 +1459,7 @@ void VBA::loadSettings()
soundVolume = 0; soundVolume = 0;
soundInterpolation = regQueryDwordValue("soundInterpolation", 0); soundInterpolation = regQueryDwordValue("soundInterpolation", 0);
if(soundInterpolation < 0 || soundInterpolation > 4) if(soundInterpolation < 0 || soundInterpolation > 1)
soundInterpolation = 0; soundInterpolation = 0;
ddrawEmulationOnly = regQueryDwordValue("ddrawEmulationOnly", false) ? true : false; ddrawEmulationOnly = regQueryDwordValue("ddrawEmulationOnly", false) ? true : false;

View File

@ -1686,16 +1686,11 @@ BEGIN
END END
POPUP "PCM interpolation" POPUP "PCM interpolation"
BEGIN BEGIN
MENUITEM "None", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE MENUITEM "On", ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR
MENUITEM "Linear", ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE
MENUITEM "Cubic", ID_OPTIONS_SOUND_PCMINTERPOLATION_CUBIC
MENUITEM "FIR (Kaiser 4T)", ID_OPTIONS_SOUND_PCMINTERPOLATION_FIR
MENUITEM "libresample", ID_OPTIONS_SOUND_PCMINTERPOLATION_LIBRESAMPLE
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Echo", ID_OPTIONS_SOUND_ECHO MENUITEM "&Echo", ID_OPTIONS_SOUND_ECHO
MENUITEM "&Low pass filter", ID_OPTIONS_SOUND_LOWPASSFILTER
MENUITEM "&Reverse Stereo", ID_OPTIONS_SOUND_REVERSESTEREO
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Sound Channels" POPUP "Sound Channels"
BEGIN BEGIN