piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DX9/DX11: Fixing some maybe possible crashes if a game was started, the config dialog opened and the game closed again. Due to other issues this still happens quite often though...

Browse Source 
Various warning fixes.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6684 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
NeoBrainX
2010-12-29 13:07:00 +00:00
parent 603c99f64f
commit 07d947c834
7 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/Src/Mixer.cpp
View File

@ -158,7 +158,7 @@ void CMixer::PushSamples(short *samples, unsigned int num_samples)
if (m_sampleRate == 32000)
Common::AtomicAdd(m_numSamples, num_samples);
else if (m_sampleRate == 48000)
Common::AtomicAdd(m_numSamples, num_samples * 1.5);
Common::AtomicAdd(m_numSamples, num_samples * 3 / 2);
else
PanicAlert("Mixer: Unsupported sample rate.");

2
Source/Core/AudioCommon/Src/XAudio2Stream.cpp
View File

@ -158,7 +158,7 @@ bool XAudio2::Start()
void XAudio2::SetVolume(int volume)
{
//linear 1- .01
m_volume = (float)volume / 100.0;
m_volume = (float)volume / 100.f;
if (pMasteringVoice)
pMasteringVoice->SetVolume(m_volume);