summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/AudioCommon.cpp
diff options
context:
space:
mode:
authorMichael Maltese <michaeljosephmaltese@gmail.com>2017-04-20 02:04:25 -0700
committerMichael Maltese <michaeljosephmaltese@gmail.com>2017-04-20 02:06:42 -0700
commitc538cdcd47fa04cd087f3538cc916c3025bcb62a (patch)
tree8f1bb175d4faa104a17a5fd8ab9b890b019d4e18 /Source/Core/AudioCommon/AudioCommon.cpp
parent6997515ec167e5bdac03bd885c137b8efd1098e2 (diff)
AudioCommon: set volume _after_ starting stream
Fixes an error with the CoreAudio backend, which apparently doesn't allow you to set the volume before starting the stream: ``` 59:31:087 AudioCommon/CoreAudioSoundStream.cpp:97 E[Audio]: error setting volume ``` This shouldn't cause any problems with other backends, since the mixer starts with silence anyways.
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
-rw-r--r--Source/Core/AudioCommon/AudioCommon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
index 59f62d7cd9..fea933e582 100644
--- a/Source/Core/AudioCommon/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -57,8 +57,6 @@ void InitSoundStream()
g_sound_stream = std::make_unique<NullSound>();
}
- UpdateSoundStream();
-
if (!g_sound_stream->Start())
{
ERROR_LOG(AUDIO, "Could not start backend %s, using %s instead", backend.c_str(),
@@ -68,6 +66,8 @@ void InitSoundStream()
g_sound_stream->Start();
}
+ UpdateSoundStream();
+
if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
StartAudioDump();
}