Merge pull request #4868 from JosJuice/android-default-audio

Fix default audio backend on Android being "No audio output"
dolphin-emu · Feb 8, 2017 · fb20989 · fb20989
2 parents 0d31929 + 0107394
commit fb20989
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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;
 }