diff options
| author | NeoBrainX <NeoBrainX@googlemail.com> | 2010-12-29 13:07:00 +0000 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@googlemail.com> | 2010-12-29 13:07:00 +0000 |
| commit | 07d947c8348022984219c56ae9cf8ee2ffc05ad3 (patch) | |
| tree | dc1785a9eb6f5c14e6d2dde7762910384fae8db8 /Source/Core/AudioCommon | |
| parent | 603c99f64f3fd91bebe18cea0061bcbd22df7b8d (diff) | |
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...
Various warning fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6684 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/Src/Mixer.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/XAudio2Stream.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index acccede47f..ddeec84b6f 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -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."); diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp index aea7dfc1fe..326cd4e318 100644 --- a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp @@ -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); |