REMOVED Sound Off option

REMOVED Sound On option

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@631 a31d4220-a93d-0410-bf67-fe4944624d44

src/win32/Commands.cpp

@@ -141,9 +141,7 @@ struct {
   { "OptionsEmulatorAGBPrint", ID_OPTIONS_EMULATOR_AGBPRINT },
   { "OptionsEmulatorRTC", ID_OPTIONS_EMULATOR_REALTIMECLOCK },
   { "OptionsEmulatorRewindInterval", ID_OPTIONS_EMULATOR_REWINDINTERVAL },
-  { "OptionsSoundOff", ID_OPTIONS_SOUND_OFF },
   { "OptionsSoundMute", ID_OPTIONS_SOUND_MUTE },
-  { "OptionsSoundOn", ID_OPTIONS_SOUND_ON },
   { "OptionsSoundChannel1", ID_OPTIONS_SOUND_CHANNEL1 },
   { "OptionsSoundChannel2", ID_OPTIONS_SOUND_CHANNEL2 },
   { "OptionsSoundChannel3", ID_OPTIONS_SOUND_CHANNEL3 },

src/win32/MainWnd.cpp

@@ -204,12 +204,8 @@ 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_OFF, OnOptionsSoundOff)
-  ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_OFF, OnUpdateOptionsSoundOff)
   ON_COMMAND(ID_OPTIONS_SOUND_MUTE, OnOptionsSoundMute)
   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_ECHO, OnOptionsSoundEcho)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ECHO, OnUpdateOptionsSoundEcho)
   ON_COMMAND(ID_OPTIONS_SOUND_LOWPASSFILTER, OnOptionsSoundLowpassfilter)

src/win32/MainWnd.h

@@ -205,12 +205,8 @@ public:
 	afx_msg void OnUpdateOptionsEmulatorPngformat(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsEmulatorBmpformat();
 	afx_msg void OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI);
-	afx_msg void OnOptionsSoundOff();
-	afx_msg void OnUpdateOptionsSoundOff(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsSoundMute();
 	afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI);
-	afx_msg void OnOptionsSoundOn();
-	afx_msg void OnUpdateOptionsSoundOn(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsSoundEcho();
 	afx_msg void OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsSoundLowpassfilter();

src/win32/MainWndOptions.cpp

@@ -800,19 +800,6 @@ void MainWnd::OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI)
   pCmdUI->SetCheck(theApp.captureFormat == 1);
 }
 
-void MainWnd::OnOptionsSoundOff()
-{
-  soundOffFlag = true;
-  soundShutdown();
-  theApp.soundInitialized = false;
-}
-
-void MainWnd::OnUpdateOptionsSoundOff(CCmdUI* pCmdUI)
-{
-  pCmdUI->SetCheck(soundOffFlag);
-  pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording);
-}
-
 void MainWnd::OnOptionsSoundMute()
 {
   soundDisable(0x30f);
@@ -824,22 +811,6 @@ void MainWnd::OnUpdateOptionsSoundMute(CCmdUI* pCmdUI)
   pCmdUI->SetCheck(active == 0);
 }
 
-void MainWnd::OnOptionsSoundOn()
-{
-  if(soundOffFlag) {
-    soundOffFlag = false;
-    soundInit();
-  }
-  soundEnable(0x30f);
-}
-
-void MainWnd::OnUpdateOptionsSoundOn(CCmdUI* pCmdUI)
-{
-  int active = soundGetEnable() & 0x30f;
-  pCmdUI->SetCheck(active != 0 && !soundOffFlag);
-  pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording);
-}
-
 void MainWnd::OnOptionsSoundEcho()
 {
   soundEcho = !soundEcho;

src/win32/VBA.cpp

@@ -1589,8 +1589,6 @@ void VBA::loadSettings()
   soundEnable(res);
   soundDisable(~res);
 
-  soundOffFlag = (regQueryDwordValue("soundOff", 0)) ? true : false;
-
   soundQuality = regQueryDwordValue("soundQuality", 1);
 
   soundEcho = regQueryDwordValue("soundEcho", 0) ? true : false;
@@ -2591,8 +2589,6 @@ void VBA::saveSettings()
 
   regSetDwordValue("soundEnable", soundGetEnable() & 0x30f);
 
-  regSetDwordValue("soundOff", soundOffFlag);
-
   regSetDwordValue("soundQuality", soundQuality);
 
   regSetDwordValue("soundEcho", soundEcho);

src/win32/VBA.rc

@@ -10,8 +10,7 @@
 #ifndef APSTUDIO_INVOKED
 #include "targetver.h"
 #endif
-#include "afxres.h"
+#include "afxres.h"
-
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -1756,9 +1755,6 @@ BEGIN
                 MENUITEM "&Sync game to audio",         ID_OPTIONS_EMULATOR_SYNCHRONIZE
             END
             MENUITEM SEPARATOR
-            MENUITEM "&On",                         ID_OPTIONS_SOUND_ON
-            MENUITEM "O&ff",                        ID_OPTIONS_SOUND_OFF
-            MENUITEM SEPARATOR
             POPUP "&Volume"
             BEGIN
                 MENUITEM "&Mute",                       ID_OPTIONS_SOUND_MUTE
@@ -2302,8 +2298,7 @@ LANGUAGE 9, 1
 #pragma code_page(1252)
 #include "res\VBA.rc2"  // non-Microsoft Visual C++ edited resources
 #include "afxres.rc"     // Standard components
-#endif
+#endif
-
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

src/win32/resource.h

@@ -575,9 +575,7 @@
 #define ID_FILE_LOAD                    40019
 #define ID_OPTIONS_SOUND_DIRECTSOUNDA   40020
 #define ID_OPTIONS_SOUND_DIRECTSOUNDB   40021
-#define ID_OPTIONS_SOUND_OFF            40022
 #define ID_OPTIONS_SOUND_MUTE           40023
-#define ID_OPTIONS_SOUND_ON             40024
 #define ID_OPTIONS_SOUND_CHANNEL1       40025
 #define ID_OPTIONS_SOUND_CHANNEL2       40026
 #define ID_OPTIONS_SOUND_CHANNEL3       40027