From 054abf79f703fcd753d847a8e1c01e25e00dab10 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 21 Jan 2014 18:08:06 +0100 Subject: [PATCH] Mixer: try PortAudio backend after SDL As there were reports about problems with PortAudio try SDL backend first. Closes #89. --- src/core/Mixer.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 59dfab03c..bb2c80f9d 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -1008,20 +1008,6 @@ AudioDevice * Mixer::tryAudioDevices() #endif -#ifdef LMMS_HAVE_PORTAUDIO - if( dev_name == AudioPortAudio::name() || dev_name == "" ) - { - dev = new AudioPortAudio( success_ful, this ); - if( success_ful ) - { - m_audioDevName = AudioPortAudio::name(); - return dev; - } - delete dev; - } -#endif - - #ifdef LMMS_HAVE_PULSEAUDIO if( dev_name == AudioPulseAudio::name() || dev_name == "" ) { @@ -1077,6 +1063,21 @@ AudioDevice * Mixer::tryAudioDevices() } #endif + +#ifdef LMMS_HAVE_PORTAUDIO + if( dev_name == AudioPortAudio::name() || dev_name == "" ) + { + dev = new AudioPortAudio( success_ful, this ); + if( success_ful ) + { + m_audioDevName = AudioPortAudio::name(); + return dev; + } + delete dev; + } +#endif + + // add more device-classes here... //dev = new audioXXXX( SAMPLE_RATES[m_qualityLevel], success_ful, this ); //if( sucess_ful )