summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-02-08 21:29:27 +0100
committerJosJuice <josjuice@gmail.com>2017-02-08 21:29:27 +0100
commit01073946b488dcacb4e2259be8d863345dc26d64 (patch)
tree6fd0d706e9f4d2d96e7c6a498801daac458f9df1 /Source
parent0d319298ba6e7fc90c5ac39de9e5eb7cc4c20b6f (diff)
Fix default audio backend on Android being "No audio output"
People who already have encountered the problem will need to manually change the audio backend (or delete the config INI).
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/AudioCommon/AudioCommon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
index 86d3d5943e..77551829bf 100644
--- a/Source/Core/AudioCommon/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -95,15 +95,15 @@ void ShutdownSoundStream()
std::string GetDefaultSoundBackend()
{
std::string backend = BACKEND_NULLSOUND;
-#if defined __linux__
+#if defined ANDROID
+ backend = BACKEND_OPENSLES;
+#elif defined __linux__
if (AlsaSound::isValid())
backend = BACKEND_ALSA;
#elif defined __APPLE__
backend = BACKEND_COREAUDIO;
#elif defined _WIN32
backend = BACKEND_XAUDIO2;
-#elif defined ANDROID
- backend = BACKEND_OPENSLES;
#endif
return backend;
}