From 00b508dfb93992c102bf5d20ceee8f64fbfe1385 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Tue, 26 Aug 2008 20:20:30 +0000 Subject: [PATCH] REMOVED sound echo menu item git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@636 a31d4220-a93d-0410-bf67-fe4944624d44 --- project/vc2008_mfc/VBA2008.vcproj | 16 ++++++++-------- src/Sound.cpp | 1 - src/Sound.h | 2 -- src/dmg/gbSound.cpp | 3 --- src/win32/Commands.cpp | 1 - src/win32/MainWnd.cpp | 2 -- src/win32/MainWnd.h | 2 -- src/win32/MainWndOptions.cpp | 10 ---------- src/win32/VBA.cpp | 4 ---- src/win32/VBA.rc | 1 - src/win32/resource.h | 1 - 11 files changed, 8 insertions(+), 35 deletions(-) diff --git a/project/vc2008_mfc/VBA2008.vcproj b/project/vc2008_mfc/VBA2008.vcproj index 5a00efb7..d11a3435 100644 --- a/project/vc2008_mfc/VBA2008.vcproj +++ b/project/vc2008_mfc/VBA2008.vcproj @@ -248,10 +248,6 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - @@ -609,6 +605,10 @@ RelativePath="..\..\src\win32\Associate.cpp" > + + @@ -956,10 +956,6 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > - - @@ -1163,6 +1159,10 @@ RelativePath="..\..\src\win32\Associate.h" > + + diff --git a/src/Sound.cpp b/src/Sound.cpp index f099795a..2a65b03e 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -60,7 +60,6 @@ float soundFiltering = 1; static float soundFiltering_; int soundVolume = 0; static int soundVolume_; -bool soundEcho = false; int soundEnableFlag = 0x3ff; // emulator channels enabled int const SOUND_CLOCK_TICKS_ = 167772; diff --git a/src/Sound.h b/src/Sound.h index 8ba49bc1..d1584aea 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -58,8 +58,6 @@ extern int soundVolume; // emulator volume code (not linear) extern int soundInterpolation; // 1 if PCM should have low-pass filtering extern float soundFiltering; // 0.0 = none, 1.0 = max (only if soundInterpolation!=0) -extern bool soundEcho; // enables echo for GB, not GBA - // Not used anymore extern bool soundLowPass; extern bool soundReverse; diff --git a/src/dmg/gbSound.cpp b/src/dmg/gbSound.cpp index 878e0fa8..f3e0b222 100644 --- a/src/dmg/gbSound.cpp +++ b/src/dmg/gbSound.cpp @@ -43,7 +43,6 @@ extern int soundTicks; extern int SOUND_CLOCK_TICKS; extern u32 soundNextPosition; -extern bool soundEcho; extern bool soundLowPass; extern bool soundReverse; extern bool soundOffFlag; @@ -134,8 +133,6 @@ void gbSoundTick() flush_samples(); - gb_effects_config.enabled = soundEcho; - // Update effects config if it was changed if ( memcmp( &gb_effects_config_current, &gb_effects_config, sizeof gb_effects_config ) ) diff --git a/src/win32/Commands.cpp b/src/win32/Commands.cpp index a8a2a0da..e75e47ce 100644 --- a/src/win32/Commands.cpp +++ b/src/win32/Commands.cpp @@ -151,7 +151,6 @@ struct { { "OptionsSound11Khz", ID_OPTIONS_SOUND_11KHZ }, { "OptionsSound22Khz", ID_OPTIONS_SOUND_22KHZ }, { "OptionsSound44Khz", ID_OPTIONS_SOUND_44KHZ }, - { "OptionsSoundEcho", ID_OPTIONS_SOUND_ECHO }, { "OptionsSoundLowPassFilter", ID_OPTIONS_SOUND_LOWPASSFILTER }, { "OptionsSoundReverseStereo", ID_OPTIONS_SOUND_REVERSESTEREO }, { "OptionsSoundVolume1x", ID_OPTIONS_SOUND_VOLUME_1X }, diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp index 7fb32ab6..a53a0965 100644 --- a/src/win32/MainWnd.cpp +++ b/src/win32/MainWnd.cpp @@ -206,8 +206,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd) 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_ECHO, OnOptionsSoundEcho) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ECHO, OnUpdateOptionsSoundEcho) ON_COMMAND(ID_OPTIONS_SOUND_LOWPASSFILTER, OnOptionsSoundLowpassfilter) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_LOWPASSFILTER, OnUpdateOptionsSoundLowpassfilter) ON_COMMAND(ID_OPTIONS_SOUND_REVERSESTEREO, OnOptionsSoundReversestereo) diff --git a/src/win32/MainWnd.h b/src/win32/MainWnd.h index 6f28eae3..ed353fb5 100644 --- a/src/win32/MainWnd.h +++ b/src/win32/MainWnd.h @@ -207,8 +207,6 @@ public: afx_msg void OnUpdateOptionsEmulatorBmpformat(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundMute(); afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI); - afx_msg void OnOptionsSoundEcho(); - afx_msg void OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundLowpassfilter(); afx_msg void OnUpdateOptionsSoundLowpassfilter(CCmdUI* pCmdUI); afx_msg void OnOptionsSoundReversestereo(); diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index 91f399dc..1d21602b 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -811,16 +811,6 @@ void MainWnd::OnUpdateOptionsSoundMute(CCmdUI* pCmdUI) pCmdUI->SetCheck(active == 0); } -void MainWnd::OnOptionsSoundEcho() -{ - soundEcho = !soundEcho; -} - -void MainWnd::OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI) -{ - pCmdUI->SetCheck(soundEcho); -} - void MainWnd::OnAudioEffects() { AudioEffectsDlg dlg; diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index 4d6bfcbf..f60988d4 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -1591,8 +1591,6 @@ void VBA::loadSettings() soundQuality = regQueryDwordValue("soundQuality", 1); - soundEcho = regQueryDwordValue("soundEcho", 0) ? true : false; - soundLowPass = regQueryDwordValue("soundLowPass", 0) ? true : false; soundReverse = regQueryDwordValue("soundReverse", 0) ? true : false; @@ -2591,8 +2589,6 @@ void VBA::saveSettings() regSetDwordValue("soundQuality", soundQuality); - regSetDwordValue("soundEcho", soundEcho); - regSetDwordValue("soundLowPass", soundLowPass); regSetDwordValue("soundReverse", soundReverse); diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 918513b6..f3df1bd4 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1796,7 +1796,6 @@ BEGIN MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE END MENUITEM SEPARATOR - MENUITEM "&Echo", ID_OPTIONS_SOUND_ECHO MENUITEM "Effects...", ID_AUDIO_EFFECTS MENUITEM SEPARATOR POPUP "Sound Channels" diff --git a/src/win32/resource.h b/src/win32/resource.h index 9051038c..65d5f506 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -684,7 +684,6 @@ #define ID_TOOLS_CUSTOMIZE 40145 #define ID_TOOLS_TILEVIEWER 40146 #define ID_OPTIONS_GAMEBOY_COLORS 40147 -#define ID_OPTIONS_SOUND_ECHO 40148 #define ID_OPTIONS_SOUND_LOWPASSFILTER 40149 #define ID_OPTIONS_SOUND_REVERSESTEREO 40150 #define ID_TOOLS_DISASSEMBLE 40151