Skip to content
Snippets Groups Projects
Commit 2c0fd610 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #26839: preferences: fix preprocessor logic

parent ec119120
No related branches found
No related tags found
No related merge requests found
...@@ -322,7 +322,8 @@ AudioLayer* AudioPreference::createAudioLayer() ...@@ -322,7 +322,8 @@ AudioLayer* AudioPreference::createAudioLayer()
{ {
#ifdef __ANDROID__ #ifdef __ANDROID__
return new OpenSLLayer(); return new OpenSLLayer();
#else #endif
#if HAVE_PULSE #if HAVE_PULSE
if (audioApi_ == PULSEAUDIO_API_STR) { if (audioApi_ == PULSEAUDIO_API_STR) {
if (system("pactl info > /dev/null") == 0) if (system("pactl info > /dev/null") == 0)
...@@ -330,7 +331,9 @@ AudioLayer* AudioPreference::createAudioLayer() ...@@ -330,7 +331,9 @@ AudioLayer* AudioPreference::createAudioLayer()
else else
WARN("pulseaudio daemon not running, falling back to ALSA"); WARN("pulseaudio daemon not running, falling back to ALSA");
} }
#elif HAVE_ALSA #endif
#if HAVE_ALSA
audioApi_ = ALSA_API_STR; audioApi_ = ALSA_API_STR;
checkSoundCard(alsaCardin_, AudioLayer::SFL_PCM_CAPTURE); checkSoundCard(alsaCardin_, AudioLayer::SFL_PCM_CAPTURE);
...@@ -341,7 +344,6 @@ AudioLayer* AudioPreference::createAudioLayer() ...@@ -341,7 +344,6 @@ AudioLayer* AudioPreference::createAudioLayer()
#else #else
return NULL; return NULL;
#endif #endif
#endif
} }
AudioLayer* AudioPreference::switchAndCreateAudioLayer() AudioLayer* AudioPreference::switchAndCreateAudioLayer()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment