mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 07:21:14 +01:00
Fix an issue with OpenAL not properly using the correct Volume on boot
Proper fix for issue 1886 as well as a fix to OGL fullscreen code that might fix issue 2095 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5028 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
fdcfade27a
commit
449b21fd65
@ -39,7 +39,7 @@ void AudioCommonConfig::Set(IniFile &file) {
|
||||
file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic);
|
||||
file.Set("Config", "EnableThrottle", m_EnableThrottle);
|
||||
file.Set("Config", "Backend", sBackend);
|
||||
// file.Set("Config", "Volume", m_Volume);
|
||||
file.Set("Config", "Volume", m_Volume);
|
||||
}
|
||||
|
||||
// Update according to the values (stream/mixer)
|
||||
|
@ -144,6 +144,9 @@ void OpenALStream::SoundLoop()
|
||||
alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES, ulFrequency);
|
||||
alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers);
|
||||
alSourcePlay(uiSource);
|
||||
|
||||
// Set the default sound volume as saved in the config file.
|
||||
alSourcef(uiSource, AL_GAIN, fVolume);
|
||||
|
||||
err = alGetError();
|
||||
// TODO: Error handling
|
||||
|
@ -56,8 +56,6 @@ reswitch:
|
||||
case PowerPC::CPU_RUNNING:
|
||||
//1: enter a fast runloop
|
||||
PowerPC::RunLoop();
|
||||
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
|
||||
return;
|
||||
break;
|
||||
|
||||
case PowerPC::CPU_STEPPING:
|
||||
|
@ -211,7 +211,7 @@ void Jit64::lXz(UGeckoInstruction inst)
|
||||
return;
|
||||
}
|
||||
|
||||
// Fast and daring/failing
|
||||
// Fast and daring
|
||||
gpr.Lock(a, d);
|
||||
gpr.LoadToX64(a, true, false);
|
||||
gpr.LoadToX64(d, a == d, true);
|
||||
|
@ -323,7 +323,7 @@ CFrame::CFrame(wxFrame* parent,
|
||||
, UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
|
||||
, bRenderToMain(false), bFloatLogWindow(false), bFloatConsoleWindow(false)
|
||||
, HaveLeds(false), HaveSpeakers(false)
|
||||
, m_bControlsCreated(false), bNoWiimoteMsg(false), m_StopDlg(NULL)
|
||||
, m_bControlsCreated(false), m_bModalDialogOpen(false), bNoWiimoteMsg(false), m_StopDlg(NULL)
|
||||
#if wxUSE_TIMER
|
||||
#ifdef _WIN32
|
||||
, m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
|
||||
|
@ -495,7 +495,7 @@ void ToggleFullscreen(HWND hParent, bool bForceFull)
|
||||
sscanf(g_Config.cInternalRes, "%dx%d", &w_fs, &h_fs);
|
||||
|
||||
// FullScreen -> Desktop
|
||||
ChangeDisplaySettings(NULL, 0);
|
||||
ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
|
||||
|
||||
DWORD style = WS_OVERLAPPEDWINDOW;
|
||||
RECT rc = {0, 0, w_fs, h_fs};
|
||||
|
Loading…
x
Reference in New Issue
Block a user