summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2011-03-16 12:59:05 +0000
committerGlenn Rice <glennricster@gmail.com>2011-03-16 12:59:05 +0000
commit52cb7fd4cac8b6a905235736645e025a65900ed8 (patch)
tree51dee7fe02d921857ce30b98a339ddd7e9b513bb /Source/Core/AudioCommon
parentaa19fa97d9343ac789c988798d6f3d972cb1265d (diff)
Fix and issue with the escape button closing the hotkey dialog when trying to set a hotkey to escape.
Fix a few more dialogs to close with escape. Fix an issue with the pulse audio sound backend when the dsp emulation method is changed, and the frequency setting was not respected. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7358 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon')
-rw-r--r--Source/Core/AudioCommon/Src/PulseAudioStream.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
index 19d5d5c298..6b3f9e7217 100644
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
+++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
@@ -73,7 +73,8 @@ void PulseAudio::SoundLoop()
bool PulseAudio::PulseInit()
{
// The Sample format to use
- static const pa_sample_spec ss = {
+ const pa_sample_spec ss =
+ {
PA_SAMPLE_S16LE,
m_mixer->GetSampleRate(),
2