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 DirectSound useOldSync option (would wait with an evil while()) 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@206 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2007-12-15 18:22:17 +00:00
parent fc6989e710
commit dd3c201018
8 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/win32/DirectSound.cpp
View File

@ -182,7 +182,6 @@ bool DirectSound::init()
} }
if( !theApp.useOldSync ) {
if( SUCCEEDED( hr = dsbSecondary->QueryInterface( IID_IDirectSoundNotify8, (LPVOID*)&dsbNotify ) ) ) { if( SUCCEEDED( hr = dsbSecondary->QueryInterface( IID_IDirectSoundNotify8, (LPVOID*)&dsbNotify ) ) ) {
dsbEvent = CreateEvent( NULL, FALSE, FALSE, NULL ); dsbEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
DSBPOSITIONNOTIFY notify[10]; DSBPOSITIONNOTIFY notify[10];
@ -198,7 +197,6 @@ bool DirectSound::init()
dsbEvent = NULL; dsbEvent = NULL;
} }
} }
}
// Play primary buffer // Play primary buffer

2
src/win32/MainWnd.cpp
View File

@ -236,8 +236,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_MUTE, OnUpdateOptionsSoundMute) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_MUTE, OnUpdateOptionsSoundMute)
ON_COMMAND(ID_OPTIONS_SOUND_ON, OnOptionsSoundOn) ON_COMMAND(ID_OPTIONS_SOUND_ON, OnOptionsSoundOn)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ON, OnUpdateOptionsSoundOn) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ON, OnUpdateOptionsSoundOn)
ON_COMMAND(ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION, OnOptionsSoundUseoldsynchronization)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION, OnUpdateOptionsSoundUseoldsynchronization)
ON_COMMAND(ID_OPTIONS_SOUND_ECHO, OnOptionsSoundEcho) ON_COMMAND(ID_OPTIONS_SOUND_ECHO, OnOptionsSoundEcho)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ECHO, OnUpdateOptionsSoundEcho) ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_ECHO, OnUpdateOptionsSoundEcho)
ON_COMMAND(ID_OPTIONS_SOUND_LOWPASSFILTER, OnOptionsSoundLowpassfilter) ON_COMMAND(ID_OPTIONS_SOUND_LOWPASSFILTER, OnOptionsSoundLowpassfilter)

2
src/win32/MainWnd.h
View File

@ -273,8 +273,6 @@ class MainWnd : public CWnd
afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsSoundMute(CCmdUI* pCmdUI);
afx_msg void OnOptionsSoundOn(); afx_msg void OnOptionsSoundOn();
afx_msg void OnUpdateOptionsSoundOn(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsSoundOn(CCmdUI* pCmdUI);
afx_msg void OnOptionsSoundUseoldsynchronization();
afx_msg void OnUpdateOptionsSoundUseoldsynchronization(CCmdUI* pCmdUI);
afx_msg void OnOptionsSoundEcho(); afx_msg void OnOptionsSoundEcho();
afx_msg void OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI); afx_msg void OnUpdateOptionsSoundEcho(CCmdUI* pCmdUI);
afx_msg void OnOptionsSoundLowpassfilter(); afx_msg void OnOptionsSoundLowpassfilter();

12
src/win32/MainWndOptions.cpp
View File

@ -1006,18 +1006,6 @@ void MainWnd::OnUpdateOptionsSoundOn(CCmdUI* pCmdUI)
pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording); pCmdUI->Enable(!theApp.aviRecording && !theApp.soundRecording);
} }
void MainWnd::OnOptionsSoundUseoldsynchronization()
{
theApp.useOldSync = !theApp.useOldSync;
systemMessage(IDS_SETTING_WILL_BE_EFFECTIVE,
"Setting will be effective the next time you start the emulator");
}
void MainWnd::OnUpdateOptionsSoundUseoldsynchronization(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(theApp.useOldSync);
}
void MainWnd::OnOptionsSoundEcho() void MainWnd::OnOptionsSoundEcho()
{ {
soundEcho = !soundEcho; soundEcho = !soundEcho;

6
src/win32/VBA.cpp
View File

@ -297,7 +297,6 @@ VBA::VBA()
regEnabled = false; regEnabled = false;
pauseWhenInactive = true; pauseWhenInactive = true;
speedupToggle = false; speedupToggle = false;
useOldSync = false;
winGbPrinterEnabled = false; winGbPrinterEnabled = false;
threadPriority = 2; threadPriority = 2;
disableMMX = false; disableMMX = false;
@ -1564,9 +1563,6 @@ void VBA::loadSettings()
pauseWhenInactive = regQueryDwordValue("pauseWhenInactive", 1) ? pauseWhenInactive = regQueryDwordValue("pauseWhenInactive", 1) ?
true : false; true : false;
useOldSync = regQueryDwordValue("useOldSync", 0) ?
TRUE : FALSE;
captureFormat = regQueryDwordValue("captureFormat", 0); captureFormat = regQueryDwordValue("captureFormat", 0);
removeIntros = regQueryDwordValue("removeIntros", false) ? true : false; removeIntros = regQueryDwordValue("removeIntros", false) ? true : false;
@ -2636,8 +2632,6 @@ void VBA::saveSettings()
regSetDwordValue("pauseWhenInactive", pauseWhenInactive); regSetDwordValue("pauseWhenInactive", pauseWhenInactive);
regSetDwordValue("useOldSync", useOldSync);
regSetDwordValue("captureFormat", captureFormat); regSetDwordValue("captureFormat", captureFormat);
regSetDwordValue("removeIntros", removeIntros); regSetDwordValue("removeIntros", removeIntros);

1
src/win32/VBA.h
View File

@ -172,7 +172,6 @@ class VBA : public CWinApp
int skinButtons; int skinButtons;
bool pauseWhenInactive; bool pauseWhenInactive;
bool speedupToggle; bool speedupToggle;
bool useOldSync;
bool winGbPrinterEnabled; bool winGbPrinterEnabled;
int threadPriority; int threadPriority;
bool disableMMX; bool disableMMX;

1
src/win32/VBA.rc
View File

@ -1706,7 +1706,6 @@ BEGIN
POPUP "Output API" POPUP "Output API"
BEGIN BEGIN
MENUITEM "DirectSound", ID_OUTPUTAPI_DIRECTSOUND MENUITEM "DirectSound", ID_OUTPUTAPI_DIRECTSOUND
MENUITEM " Use &old synchronization", ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "OpenAL", ID_OUTPUTAPI_OPENAL MENUITEM "OpenAL", ID_OUTPUTAPI_OPENAL
MENUITEM " Configuration...", ID_OUTPUTAPI_OALCONFIGURATION MENUITEM " Configuration...", ID_OUTPUTAPI_OALCONFIGURATION

1
src/win32/resource.h
View File

@ -633,7 +633,6 @@
#define ID_OPTIONS_VIDEO_LAYERS_WIN1 40133 #define ID_OPTIONS_VIDEO_LAYERS_WIN1 40133
#define ID_OPTIONS_VIDEO_LAYERS_OBJWIN 40134 #define ID_OPTIONS_VIDEO_LAYERS_OBJWIN 40134
#define ID_FILE_OPENGAMEBOY 40135 #define ID_FILE_OPENGAMEBOY 40135
#define ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION 40136
#define ID_DEBUG_NEXTFRAME 40137 #define ID_DEBUG_NEXTFRAME 40137
#define ID_TOOLS_MAPVIEW 40138 #define ID_TOOLS_MAPVIEW 40138
#define ID_TOOLS_PALETTEVIEW 40139 #define ID_TOOLS_PALETTEVIEW 40139