diff --git a/src/win32/Commands.cpp b/src/win32/Commands.cpp index feb89d3d..9c91fb56 100644 --- a/src/win32/Commands.cpp +++ b/src/win32/Commands.cpp @@ -141,7 +141,6 @@ struct { { "OptionsEmulatorAGBPrint", ID_OPTIONS_EMULATOR_AGBPRINT }, { "OptionsEmulatorRTC", ID_OPTIONS_EMULATOR_REALTIMECLOCK }, { "OptionsEmulatorRewindInterval", ID_OPTIONS_EMULATOR_REWINDINTERVAL }, - { "OptionsSoundMute", ID_OPTIONS_SOUND_MUTE }, { "OptionsSoundChannel1", ID_OPTIONS_SOUND_CHANNEL1 }, { "OptionsSoundChannel2", ID_OPTIONS_SOUND_CHANNEL2 }, { "OptionsSoundChannel3", ID_OPTIONS_SOUND_CHANNEL3 }, @@ -151,10 +150,6 @@ struct { { "OptionsSound11Khz", ID_OPTIONS_SOUND_11KHZ }, { "OptionsSound22Khz", ID_OPTIONS_SOUND_22KHZ }, { "OptionsSound44Khz", ID_OPTIONS_SOUND_44KHZ }, - { "OptionsSoundVolume1x", ID_OPTIONS_SOUND_VOLUME_1X }, - { "OptionsSoundVolume2x", ID_OPTIONS_SOUND_VOLUME_2X }, - { "OptionsSoundVolume3x", ID_OPTIONS_SOUND_VOLUME_3X }, - { "OptionsSoundVolume4x", ID_OPTIONS_SOUND_VOLUME_4X }, { "OptionsGameboyBorder", ID_OPTIONS_GAMEBOY_BORDER }, { "OptionsGameboyBorderAutomatic", ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC }, { "OptionsGameboyColors", ID_OPTIONS_GAMEBOY_COLORS }, diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp index 9bc6ccd6..57a5ba9f 100644 --- a/src/win32/MainWnd.cpp +++ b/src/win32/MainWnd.cpp @@ -204,8 +204,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_PNGFORMAT, OnUpdateOptionsEmulatorPngformat) ON_COMMAND(ID_OPTIONS_EMULATOR_BMPFORMAT, OnOptionsEmulatorBmpformat) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_BMPFORMAT, OnUpdateOptionsEmulatorBmpformat) - ON_COMMAND(ID_OPTIONS_SOUND_MUTE, OnOptionsSoundMute) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_MUTE, OnUpdateOptionsSoundMute) ON_COMMAND(ID_OPTIONS_SOUND_11KHZ, OnOptionsSound11khz) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_11KHZ, OnUpdateOptionsSound11khz) ON_COMMAND(ID_OPTIONS_SOUND_22KHZ, OnOptionsSound22khz) @@ -332,10 +330,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) ON_UPDATE_COMMAND_UI(ID_FILE_LOADGAME_MOSTRECENT, OnUpdateFileLoadgameMostrecent) ON_COMMAND(ID_FILE_LOADGAME_AUTOLOADMOSTRECENT, OnFileLoadgameAutoloadmostrecent) ON_UPDATE_COMMAND_UI(ID_FILE_LOADGAME_AUTOLOADMOSTRECENT, OnUpdateFileLoadgameAutoloadmostrecent) - ON_COMMAND(ID_OPTIONS_SOUND_VOLUME_25X, OnOptionsSoundVolume25x) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_VOLUME_25X, OnUpdateOptionsSoundVolume25x) - ON_COMMAND(ID_OPTIONS_SOUND_VOLUME_5X, OnOptionsSoundVolume5x) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_VOLUME_5X, OnUpdateOptionsSoundVolume5x) ON_COMMAND(ID_CHEATS_DISABLECHEATS, OnCheatsDisablecheats) ON_UPDATE_COMMAND_UI(ID_CHEATS_DISABLECHEATS, OnUpdateCheatsDisablecheats) ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE, OnOptionsVideoFullscreenmaxscale) @@ -365,8 +359,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) ON_COMMAND(ID_SYSTEM_MINIMIZE, OnSystemMinimize) ON_COMMAND_EX_RANGE(ID_OPTIONS_EMULATOR_SHOWSPEED_NONE, ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT, OnOptionsEmulatorShowSpeed) ON_UPDATE_COMMAND_UI_RANGE(ID_OPTIONS_EMULATOR_SHOWSPEED_NONE, ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT, OnUpdateOptionsEmulatorShowSpeed) - ON_COMMAND_EX_RANGE(ID_OPTIONS_SOUND_VOLUME_1X, ID_OPTIONS_SOUND_VOLUME_4X, OnOptionsSoundVolume) - ON_UPDATE_COMMAND_UI_RANGE(ID_OPTIONS_SOUND_VOLUME_1X, ID_OPTIONS_SOUND_VOLUME_4X, OnUpdateOptionsSoundVolume) ON_COMMAND_EX_RANGE(ID_OPTIONS_PRIORITY_HIGHEST, ID_OPTIONS_PRIORITY_BELOWNORMAL, OnOptionsPriority) ON_UPDATE_COMMAND_UI_RANGE(ID_OPTIONS_PRIORITY_HIGHEST, ID_OPTIONS_PRIORITY_BELOWNORMAL, OnUpdateOptionsPriority) ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_NORMAL, ID_OPTIONS_FILTER_TVMODE, OnOptionsFilter) diff --git a/src/win32/MainWnd.h b/src/win32/MainWnd.h index 505b89b4..0b60bd9a 100644 --- a/src/win32/MainWnd.h +++ b/src/win32/MainWnd.h @@ -64,8 +64,6 @@ public: afx_msg BOOL OnOptionsFilter(UINT nID); afx_msg void OnUpdateOptionsPriority(CCmdUI *pCmdUI); afx_msg BOOL OnOptionsPriority(UINT nID); - afx_msg void OnUpdateOptionsSoundVolume(CCmdUI *pCmdUI); - afx_msg BOOL OnOptionsSoundVolume(UINT nID); afx_msg void OnUpdateOptionsEmulatorShowSpeed(CCmdUI *pCmdUI); afx_msg BOOL OnOptionsEmulatorShowSpeed(UINT nID); afx_msg void OnSystemMinimize(); @@ -205,8 +203,6 @@ public: afx_msg void OnUpdateOptionsEmulatorPngformat(CCmdUI* pCmdUI); afx_msg void OnOptionsEmulatorBmpformat(); afx_msg void OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI); - afx_msg void OnOptionsSoundMute(); - afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI); afx_msg void OnOptionsSound11khz(); afx_msg void OnUpdateOptionsSound11khz(CCmdUI* pCmdUI); afx_msg void OnOptionsSound22khz(); @@ -333,10 +329,6 @@ public: afx_msg void OnUpdateFileLoadgameMostrecent(CCmdUI* pCmdUI); afx_msg void OnFileLoadgameAutoloadmostrecent(); afx_msg void OnUpdateFileLoadgameAutoloadmostrecent(CCmdUI* pCmdUI); - afx_msg void OnOptionsSoundVolume25x(); - afx_msg void OnUpdateOptionsSoundVolume25x(CCmdUI* pCmdUI); - afx_msg void OnOptionsSoundVolume5x(); - afx_msg void OnUpdateOptionsSoundVolume5x(CCmdUI* pCmdUI); afx_msg void OnCheatsDisablecheats(); afx_msg void OnUpdateCheatsDisablecheats(CCmdUI* pCmdUI); afx_msg void OnOptionsVideoFullscreenmaxscale(); diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index c025544b..e4c6379f 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -800,20 +800,6 @@ void MainWnd::OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI) pCmdUI->SetCheck(theApp.captureFormat == 1); } -void MainWnd::OnOptionsSoundMute() -{ - if( 0 == soundGetEnable() ) { - soundSetEnable( 0x30f ); - } else { - soundSetEnable( 0x000 ); - } -} - -void MainWnd::OnUpdateOptionsSoundMute(CCmdUI* pCmdUI) -{ - pCmdUI->SetCheck( 0 == soundGetEnable() ); -} - void MainWnd::OnAudioEffects() { AudioCoreSettingsDlg dlg; @@ -880,39 +866,6 @@ void MainWnd::OnUpdateOptionsSound44khz(CCmdUI* pCmdUI) pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording); } -BOOL MainWnd::OnOptionsSoundVolume(UINT nID) -{ - UINT soundVolume = nID - ID_OPTIONS_SOUND_VOLUME_1X + 1; - soundSetVolume( (float)soundVolume ); - return TRUE; -} - -void MainWnd::OnUpdateOptionsSoundVolume(CCmdUI *pCmdUI) -{ - pCmdUI->SetCheck( soundGetVolume() == (float)(pCmdUI->m_nID - ID_OPTIONS_SOUND_VOLUME_1X + 1) ); -} - - -void MainWnd::OnOptionsSoundVolume25x() -{ - soundSetVolume( 0.25f ); -} - -void MainWnd::OnUpdateOptionsSoundVolume25x(CCmdUI* pCmdUI) -{ - pCmdUI->SetCheck( 0.25f == soundGetVolume() ); -} - -void MainWnd::OnOptionsSoundVolume5x() -{ - soundSetVolume( 0.5f ); -} - -void MainWnd::OnUpdateOptionsSoundVolume5x(CCmdUI* pCmdUI) -{ - pCmdUI->SetCheck( 0.5f == soundGetVolume() ); -} - void MainWnd::updateSoundChannels(UINT id) { int flag = 0; diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 1f0833e1..c926e320 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1779,17 +1779,8 @@ BEGIN MENUITEM "&Sync game to audio", ID_OPTIONS_EMULATOR_SYNCHRONIZE END MENUITEM SEPARATOR - POPUP "&Volume" - BEGIN - MENUITEM "&Mute", ID_OPTIONS_SOUND_MUTE - MENUITEM SEPARATOR - MENUITEM "2&5%", ID_OPTIONS_SOUND_VOLUME_25X - MENUITEM "5&0%", ID_OPTIONS_SOUND_VOLUME_5X - MENUITEM "&100%", ID_OPTIONS_SOUND_VOLUME_1X - MENUITEM "&200%", ID_OPTIONS_SOUND_VOLUME_2X - MENUITEM "&300%", ID_OPTIONS_SOUND_VOLUME_3X - MENUITEM "&400%", ID_OPTIONS_SOUND_VOLUME_4X - END + MENUITEM "Core Settings...", ID_AUDIO_CORE_SETTINGS + MENUITEM SEPARATOR POPUP "Sampling Rate" BEGIN MENUITEM "&11025 Hz", ID_OPTIONS_SOUND_11KHZ @@ -1802,8 +1793,6 @@ BEGIN MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE END MENUITEM SEPARATOR - MENUITEM "Core Settings...", ID_AUDIO_CORE_SETTINGS - MENUITEM SEPARATOR POPUP "Sound Channels" BEGIN MENUITEM "Channel &1", ID_OPTIONS_SOUND_CHANNEL1, CHECKED diff --git a/src/win32/resource.h b/src/win32/resource.h index a0af800d..648abe8e 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -586,7 +586,6 @@ #define ID_FILE_LOAD 40019 #define ID_OPTIONS_SOUND_DIRECTSOUNDA 40020 #define ID_OPTIONS_SOUND_DIRECTSOUNDB 40021 -#define ID_OPTIONS_SOUND_MUTE 40023 #define ID_OPTIONS_SOUND_CHANNEL1 40025 #define ID_OPTIONS_SOUND_CHANNEL2 40026 #define ID_OPTIONS_SOUND_CHANNEL3 40027 @@ -716,10 +715,6 @@ #define ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH 40176 #define ID_TOOLS_RECORD_STARTAVIRECORDING 40178 #define ID_TOOLS_RECORD_STOPAVIRECORDING 40179 -#define ID_OPTIONS_SOUND_VOLUME_1X 40182 -#define ID_OPTIONS_SOUND_VOLUME_2X 40183 -#define ID_OPTIONS_SOUND_VOLUME_3X 40184 -#define ID_OPTIONS_SOUND_VOLUME_4X 40185 #define ID_OPTIONS_FILTER_BILINEAR 40186 #define ID_OPTIONS_FILTER_BILINEARPLUS 40187 #define ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE 40188 @@ -783,8 +778,6 @@ #define ID_FILE_LOADGAME_MOSTRECENT 40267 #define ID_FILE_SAVEGAME_OLDESTSLOT 40268 #define ID_FILE_LOADGAME_AUTOLOADMOSTRECENT 40269 -#define ID_OPTIONS_SOUND_VOLUME_5X 40270 -#define ID_OPTIONS_SOUND_VOLUME_25X 40271 #define ID_CHEATS_DISABLECHEATS 40272 #define ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE 40273 #define ID_OPTIONS_FILTER_HQ2X 40274