cmake: fix sound driver detection on gnu/linux

parent 3e283af2
......@@ -88,7 +88,9 @@ cmake_dependent_option(ENABLE_ARTSC "Enable artsc (KDE<4) sound input/output." N
cmake_dependent_option(ENABLE_MACSND "Enable MAC OS X Audio Units sound support." ${ENABLE_MACSND_DEFAULT_VALUE} "ENABLE_SOUND;APPLE" NO)
cmake_dependent_option(ENABLE_MACAQSND "Enable native MAC OS X Audio Queue sound support." ${ENABLE_MACAQSND_DEFAULT_VALUE} "ENABLE_SOUND;APPLE" NO)
cmake_dependent_option(ENABLE_QSA "Enable QSA (QNX Sound Architecture) support." NO "ENABLE_SOUND" NO)
cmake_dependent_option(ENABLE_OSS "Enable OSS support." YES "ENABLE_SOUND;LINUX_OR_BSD" NO)
# OSS is mostly deprecated in 2016, so it should not be built by default (it won't work anyway). Let user defines it
# itself only if he REALLY needs it.
cmake_dependent_option(ENABLE_OSS "Enable OSS support." NO "ENABLE_SOUND;LINUX_OR_BSD" NO)
cmake_dependent_option(ENABLE_PORTAUDIO "Enable portaudio native support." NO "ENABLE_SOUND" NO)
cmake_dependent_option(ENABLE_PULSEAUDIO "Enable pulseaudio support." YES "ENABLE_SOUND" NO)
option(ENABLE_GSM "Build mediastreamer2 with the GSM codec." YES)
......
......@@ -33,8 +33,6 @@
#cmakedefine MS_FIXED_POINT
#define HAVE_NON_FREE_CODECS ${HAVE_NON_FREE_CODECS}
#cmakedefine HAVE_CU_GET_SUITE 1
#cmakedefine HAVE_CU_CURSES 1
#cmakedefine HAVE_SRTP
#cmakedefine HAVE_ZRTP
......@@ -69,3 +67,5 @@
#cmakedefine HAVE_PCAP 1
#cmakedefine HAVE_MATROSKA 1
#cmakedefine HAVE_VPX 1
#cmakedefine HAVE_SYS_SOUNDCARD_H 1
......@@ -261,7 +261,7 @@ void ms_factory_init_voip(MSFactory *obj){
if (obj->voip_initd) return;
ms_srtp_init();
/* register builtin VoIP MSFilter's */
for (i=0;ms_voip_filter_descs[i]!=NULL;i++){
ms_factory_register_filter(obj,ms_voip_filter_descs[i]);
......@@ -272,7 +272,7 @@ void ms_factory_init_voip(MSFactory *obj){
__register_ffmpeg_encoders_if_possible(obj);
__register_ffmpeg_h264_decoder_if_possible(obj);
#endif
#if defined(__APPLE__) && defined(VIDEO_ENABLED)
_register_videotoolbox_if_supported(obj);
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment