From 1bb276b3654e286b1a4be7082824612f94a05ed1 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 18 Sep 2015 14:08:57 -0400 Subject: [PATCH] Make SDL default for all platforms Closes #1600 --- src/core/Mixer.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 5c85ff2f366..a9da761f536 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -747,6 +747,20 @@ AudioDevice * Mixer::tryAudioDevices() dev_name = ""; } +#ifdef LMMS_HAVE_SDL + if( dev_name == AudioSdl::name() || dev_name == "" ) + { + dev = new AudioSdl( success_ful, this ); + if( success_ful ) + { + m_audioDevName = AudioSdl::name(); + return dev; + } + delete dev; + } +#endif + + #ifdef LMMS_HAVE_ALSA if( dev_name == AudioAlsa::name() || dev_name == "" ) { @@ -803,20 +817,6 @@ AudioDevice * Mixer::tryAudioDevices() #endif -#ifdef LMMS_HAVE_SDL - if( dev_name == AudioSdl::name() || dev_name == "" ) - { - dev = new AudioSdl( success_ful, this ); - if( success_ful ) - { - m_audioDevName = AudioSdl::name(); - return dev; - } - delete dev; - } -#endif - - #ifdef LMMS_HAVE_PORTAUDIO if( dev_name == AudioPortAudio::name() || dev_name == "" ) {