ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REMOVED volume controls in menu bar

This commit is contained in:
spacy51 2008-08-27 19:02:19 +00:00
parent 7eaef013a3
commit 7a988e84e8
6 changed files with 2 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/win32/Commands.cpp
View File

@ -141,7 +141,6 @@ struct {
{ "OptionsEmulatorAGBPrint", ID_OPTIONS_EMULATOR_AGBPRINT }, { "OptionsEmulatorAGBPrint", ID_OPTIONS_EMULATOR_AGBPRINT },
{ "OptionsEmulatorRTC", ID_OPTIONS_EMULATOR_REALTIMECLOCK }, { "OptionsEmulatorRTC", ID_OPTIONS_EMULATOR_REALTIMECLOCK },
{ "OptionsEmulatorRewindInterval", ID_OPTIONS_EMULATOR_REWINDINTERVAL }, { "OptionsEmulatorRewindInterval", ID_OPTIONS_EMULATOR_REWINDINTERVAL },
{ "OptionsSoundMute", ID_OPTIONS_SOUND_MUTE },
{ "OptionsSoundChannel1", ID_OPTIONS_SOUND_CHANNEL1 }, { "OptionsSoundChannel1", ID_OPTIONS_SOUND_CHANNEL1 },
{ "OptionsSoundChannel2", ID_OPTIONS_SOUND_CHANNEL2 }, { "OptionsSoundChannel2", ID_OPTIONS_SOUND_CHANNEL2 },
{ "OptionsSoundChannel3", ID_OPTIONS_SOUND_CHANNEL3 }, { "OptionsSoundChannel3", ID_OPTIONS_SOUND_CHANNEL3 },
@ -151,10 +150,6 @@ struct {
{ "OptionsSound11Khz", ID_OPTIONS_SOUND_11KHZ }, { "OptionsSound11Khz", ID_OPTIONS_SOUND_11KHZ },
{ "OptionsSound22Khz", ID_OPTIONS_SOUND_22KHZ }, { "OptionsSound22Khz", ID_OPTIONS_SOUND_22KHZ },
{ "OptionsSound44Khz", ID_OPTIONS_SOUND_44KHZ }, { "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 }, { "OptionsGameboyBorder", ID_OPTIONS_GAMEBOY_BORDER },
{ "OptionsGameboyBorderAutomatic", ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC }, { "OptionsGameboyBorderAutomatic", ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC },
{ "OptionsGameboyColors", ID_OPTIONS_GAMEBOY_COLORS }, { "OptionsGameboyColors", ID_OPTIONS_GAMEBOY_COLORS },

8
src/win32/MainWnd.cpp
View File

@ -204,8 +204,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_PNGFORMAT, OnUpdateOptionsEmulatorPngformat) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_PNGFORMAT, OnUpdateOptionsEmulatorPngformat)
ON_COMMAND(ID_OPTIONS_EMULATOR_BMPFORMAT, OnOptionsEmulatorBmpformat) ON_COMMAND(ID_OPTIONS_EMULATOR_BMPFORMAT, OnOptionsEmulatorBmpformat)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_BMPFORMAT, OnUpdateOptionsEmulatorBmpformat) 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_COMMAND(ID_OPTIONS_SOUND_11KHZ, OnOptionsSound11khz)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_11KHZ, OnUpdateOptionsSound11khz) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_11KHZ, OnUpdateOptionsSound11khz)
ON_COMMAND(ID_OPTIONS_SOUND_22KHZ, OnOptionsSound22khz) 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_UPDATE_COMMAND_UI(ID_FILE_LOADGAME_MOSTRECENT, OnUpdateFileLoadgameMostrecent)
ON_COMMAND(ID_FILE_LOADGAME_AUTOLOADMOSTRECENT, OnFileLoadgameAutoloadmostrecent) ON_COMMAND(ID_FILE_LOADGAME_AUTOLOADMOSTRECENT, OnFileLoadgameAutoloadmostrecent)
ON_UPDATE_COMMAND_UI(ID_FILE_LOADGAME_AUTOLOADMOSTRECENT, OnUpdateFileLoadgameAutoloadmostrecent) 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_COMMAND(ID_CHEATS_DISABLECHEATS, OnCheatsDisablecheats)
ON_UPDATE_COMMAND_UI(ID_CHEATS_DISABLECHEATS, OnUpdateCheatsDisablecheats) ON_UPDATE_COMMAND_UI(ID_CHEATS_DISABLECHEATS, OnUpdateCheatsDisablecheats)
ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE, OnOptionsVideoFullscreenmaxscale) ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE, OnOptionsVideoFullscreenmaxscale)
@ -365,8 +359,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
ON_COMMAND(ID_SYSTEM_MINIMIZE, OnSystemMinimize) ON_COMMAND(ID_SYSTEM_MINIMIZE, OnSystemMinimize)
ON_COMMAND_EX_RANGE(ID_OPTIONS_EMULATOR_SHOWSPEED_NONE, ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT, OnOptionsEmulatorShowSpeed) 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_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_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_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) ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_NORMAL, ID_OPTIONS_FILTER_TVMODE, OnOptionsFilter)

8
src/win32/MainWnd.h
View File

@ -64,8 +64,6 @@ public:
afx_msg BOOL OnOptionsFilter(UINT nID); afx_msg BOOL OnOptionsFilter(UINT nID);
afx_msg void OnUpdateOptionsPriority(CCmdUI *pCmdUI); afx_msg void OnUpdateOptionsPriority(CCmdUI *pCmdUI);
afx_msg BOOL OnOptionsPriority(UINT nID); 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 void OnUpdateOptionsEmulatorShowSpeed(CCmdUI *pCmdUI);
afx_msg BOOL OnOptionsEmulatorShowSpeed(UINT nID); afx_msg BOOL OnOptionsEmulatorShowSpeed(UINT nID);
afx_msg void OnSystemMinimize(); afx_msg void OnSystemMinimize();
@ -205,8 +203,6 @@ public:
afx_msg void OnUpdateOptionsEmulatorPngformat(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsEmulatorPngformat(CCmdUI* pCmdUI);
afx_msg void OnOptionsEmulatorBmpformat(); afx_msg void OnOptionsEmulatorBmpformat();
afx_msg void OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI);
afx_msg void OnOptionsSoundMute();
afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI);
afx_msg void OnOptionsSound11khz(); afx_msg void OnOptionsSound11khz();
afx_msg void OnUpdateOptionsSound11khz(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsSound11khz(CCmdUI* pCmdUI);
afx_msg void OnOptionsSound22khz(); afx_msg void OnOptionsSound22khz();
@ -333,10 +329,6 @@ public:
afx_msg void OnUpdateFileLoadgameMostrecent(CCmdUI* pCmdUI); afx_msg void OnUpdateFileLoadgameMostrecent(CCmdUI* pCmdUI);
afx_msg void OnFileLoadgameAutoloadmostrecent(); afx_msg void OnFileLoadgameAutoloadmostrecent();
afx_msg void OnUpdateFileLoadgameAutoloadmostrecent(CCmdUI* pCmdUI); 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 OnCheatsDisablecheats();
afx_msg void OnUpdateCheatsDisablecheats(CCmdUI* pCmdUI); afx_msg void OnUpdateCheatsDisablecheats(CCmdUI* pCmdUI);
afx_msg void OnOptionsVideoFullscreenmaxscale(); afx_msg void OnOptionsVideoFullscreenmaxscale();

47
src/win32/MainWndOptions.cpp
View File

@ -800,20 +800,6 @@ void MainWnd::OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI)
pCmdUI->SetCheck(theApp.captureFormat == 1); 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() void MainWnd::OnAudioEffects()
{ {
AudioCoreSettingsDlg dlg; AudioCoreSettingsDlg dlg;
@ -880,39 +866,6 @@ void MainWnd::OnUpdateOptionsSound44khz(CCmdUI* pCmdUI)
pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording); 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) void MainWnd::updateSoundChannels(UINT id)
{ {
int flag = 0; int flag = 0;

13
src/win32/VBA.rc
View File

@ -1779,17 +1779,8 @@ BEGIN
MENUITEM "&Sync game to audio", ID_OPTIONS_EMULATOR_SYNCHRONIZE MENUITEM "&Sync game to audio", ID_OPTIONS_EMULATOR_SYNCHRONIZE
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "&Volume" MENUITEM "Core Settings...", ID_AUDIO_CORE_SETTINGS
BEGIN
MENUITEM "&Mute", ID_OPTIONS_SOUND_MUTE
MENUITEM SEPARATOR 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
POPUP "Sampling Rate" POPUP "Sampling Rate"
BEGIN BEGIN
MENUITEM "&11025 Hz", ID_OPTIONS_SOUND_11KHZ MENUITEM "&11025 Hz", ID_OPTIONS_SOUND_11KHZ
@ -1802,8 +1793,6 @@ BEGIN
MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Core Settings...", ID_AUDIO_CORE_SETTINGS
MENUITEM SEPARATOR
POPUP "Sound Channels" POPUP "Sound Channels"
BEGIN BEGIN
MENUITEM "Channel &1", ID_OPTIONS_SOUND_CHANNEL1, CHECKED MENUITEM "Channel &1", ID_OPTIONS_SOUND_CHANNEL1, CHECKED

7
src/win32/resource.h
View File

@ -586,7 +586,6 @@
#define ID_FILE_LOAD 40019 #define ID_FILE_LOAD 40019
#define ID_OPTIONS_SOUND_DIRECTSOUNDA 40020 #define ID_OPTIONS_SOUND_DIRECTSOUNDA 40020
#define ID_OPTIONS_SOUND_DIRECTSOUNDB 40021 #define ID_OPTIONS_SOUND_DIRECTSOUNDB 40021
#define ID_OPTIONS_SOUND_MUTE 40023
#define ID_OPTIONS_SOUND_CHANNEL1 40025 #define ID_OPTIONS_SOUND_CHANNEL1 40025
#define ID_OPTIONS_SOUND_CHANNEL2 40026 #define ID_OPTIONS_SOUND_CHANNEL2 40026
#define ID_OPTIONS_SOUND_CHANNEL3 40027 #define ID_OPTIONS_SOUND_CHANNEL3 40027
@ -716,10 +715,6 @@
#define ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH 40176 #define ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH 40176
#define ID_TOOLS_RECORD_STARTAVIRECORDING 40178 #define ID_TOOLS_RECORD_STARTAVIRECORDING 40178
#define ID_TOOLS_RECORD_STOPAVIRECORDING 40179 #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_BILINEAR 40186
#define ID_OPTIONS_FILTER_BILINEARPLUS 40187 #define ID_OPTIONS_FILTER_BILINEARPLUS 40187
#define ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE 40188 #define ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE 40188
@ -783,8 +778,6 @@
#define ID_FILE_LOADGAME_MOSTRECENT 40267 #define ID_FILE_LOADGAME_MOSTRECENT 40267
#define ID_FILE_SAVEGAME_OLDESTSLOT 40268 #define ID_FILE_SAVEGAME_OLDESTSLOT 40268
#define ID_FILE_LOADGAME_AUTOLOADMOSTRECENT 40269 #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_CHEATS_DISABLECHEATS 40272
#define ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE 40273 #define ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE 40273
#define ID_OPTIONS_FILTER_HQ2X 40274 #define ID_OPTIONS_FILTER_HQ2X 40274