Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
2c0fd610
Commit
2c0fd610
authored
Jul 15, 2013
by
Tristan Matthews
Browse files
* #26839: preferences: fix preprocessor logic
parent
ec119120
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/preferences.cpp
View file @
2c0fd610
...
...
@@ -322,7 +322,8 @@ AudioLayer* AudioPreference::createAudioLayer()
{
#ifdef __ANDROID__
return
new
OpenSLLayer
();
#else
#endif
#if HAVE_PULSE
if
(
audioApi_
==
PULSEAUDIO_API_STR
)
{
if
(
system
(
"pactl info > /dev/null"
)
==
0
)
...
...
@@ -330,7 +331,9 @@ AudioLayer* AudioPreference::createAudioLayer()
else
WARN
(
"pulseaudio daemon not running, falling back to ALSA"
);
}
#elif HAVE_ALSA
#endif
#if HAVE_ALSA
audioApi_
=
ALSA_API_STR
;
checkSoundCard
(
alsaCardin_
,
AudioLayer
::
SFL_PCM_CAPTURE
);
...
...
@@ -339,8 +342,7 @@ AudioLayer* AudioPreference::createAudioLayer()
return
new
AlsaLayer
(
*
this
);
#else
return
NULL
;
#endif
return
NULL
;
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment