Commit fa4c30aa authored by Yann Diorcet's avatar Yann Diorcet
Browse files

Merge branch 'master' of git.linphone.org:mediastreamer2

Conflicts:
	src/ioscapture.m
	src/iosdisplay.m
	src/msosxdisplay.m
parents 4ef6e73a 88b9146c
......@@ -62,7 +62,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
dnl conditionnal build of video support
AC_ARG_ENABLE(video,
[ --enable-video Turn on video support compiling],
[AS_HELP_STRING([--enable-video], [Turn on video support compiling (default=yes])],
[case "${enableval}" in
yes) video=true ;;
no) video=false ;;
......@@ -70,7 +70,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
esac],[video=true])
AC_ARG_ENABLE(ffmpeg,
[ --disable-ffmpeg Disable ffmpeg support],
[AS_HELP_STRING([--disable-ffmpeg], [Disable ffmpeg support])],
[case "${enableval}" in
yes) ffmpeg=true ;;
no) ffmpeg=false ;;
......@@ -140,7 +140,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
AC_ARG_ENABLE(sdl,
[ --disable-sdl Disable SDL support (default: disabled except on macos)],
[AS_HELP_STRING([--disable-sdl], [Disable SDL support (default: disabled except on macos)])],
[case "${enableval}" in
yes) enable_sdl=true ;;
no) enable_sdl=false ;;
......@@ -154,7 +154,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
AC_ARG_ENABLE(x11,
[ --disable-x11 Disable X11 support],
[AS_HELP_STRING([--disable-x11], [Disable X11 support])],
[case "${enableval}" in
yes) enable_x11=true ;;
no) enable_x11=false ;;
......@@ -166,7 +166,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
AC_ARG_ENABLE(xv,
[ --enable-xv Enable xv support],
[AS_HELP_STRING([--enable-xv], [Enable xv support])],
[case "${enableval}" in
yes) enable_xv=true ;;
no) enable_xv=false ;;
......@@ -184,7 +184,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
fi
AC_ARG_ENABLE(gl,
[ --enable-gl Enable GL rendering support (require glx and glew)],
[AS_HELP_STRING([--enable-gl], [Enable GL rendering support (require glx and glew)])],
[case "${enableval}" in
yes) enable_gl=true ;;
no) enable_gl=false ;;
......@@ -205,7 +205,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
AC_ARG_ENABLE(theora,
[ --disable-theora Disable theora support],
[AS_HELP_STRING([--disable-theora], [Disable theora support])],
[case "${enableval}" in
yes) theora=true ;;
no) theora=false ;;
......@@ -218,7 +218,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
AC_ARG_ENABLE(vp8,
[ --disable-vp8 Disable vp8 support],
[AS_HELP_STRING([--disable-vp8], [Disable vp8 support])],
[case "${enableval}" in
yes) vp8=true ;;
no) vp8=false ;;
......
......@@ -48,6 +48,7 @@ LOCAL_SRC_FILES = \
msfilter.c \
msqueue.c \
msticker.c \
msvoip.c \
alaw.c \
ulaw.c \
mssndcard.c \
......@@ -79,13 +80,8 @@ LOCAL_SRC_FILES = \
msg722.c \
g722_decode.c \
g722_encode.c \
l16.c
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SRC_FILES += msresample.c.neon
else
LOCAL_SRC_FILES += msresample.c
endif
l16.c \
msresample.c
##if BUILD_ALSA
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
......@@ -150,6 +146,7 @@ LOCAL_CFLAGS += \
-UHAVE_CONFIG_H \
-include $(LOCAL_PATH)/../build/android/libmediastreamer2_AndroidConfig.h \
-DMS2_INTERNAL \
-DMS2_FILTERS \
-DINET6 \
-DORTP_INET6 \
-D_POSIX_SOURCE -Wall
......
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
NULL
};
......@@ -7,11 +7,8 @@ extern MSFilterDesc ms_ulaw_enc_desc;
extern MSFilterDesc ms_rtp_send_desc;
extern MSFilterDesc ms_rtp_recv_desc;
extern MSFilterDesc ms_dtmf_gen_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_conf_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_equalizer_desc;
extern MSFilterDesc ms_speex_dec_desc;
extern MSFilterDesc ms_speex_enc_desc;
......@@ -42,7 +39,7 @@ extern MSFilterDesc ms_l16_dec_desc;
extern MSFilterDesc ms_jpeg_writer_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -50,11 +47,8 @@ MSFilterDesc * ms_filter_descs[]={
&ms_rtp_send_desc,
&ms_rtp_recv_desc,
&ms_dtmf_gen_desc,
&ms_tee_desc,
&ms_conf_desc,
&ms_join_desc,
&ms_volume_desc,
&ms_void_sink_desc,
&ms_speex_dec_desc,
&ms_speex_enc_desc,
&ms_speex_ec_desc,
......
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
&ms_itc_source_desc,
&ms_itc_sink_desc,
NULL
};
......@@ -7,16 +7,11 @@ extern MSFilterDesc ms_ulaw_enc_desc;
extern MSFilterDesc ms_rtp_send_desc;
extern MSFilterDesc ms_rtp_recv_desc;
extern MSFilterDesc ms_dtmf_gen_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_conf_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_equalizer_desc;
extern MSFilterDesc ms_channel_adapter_desc;
extern MSFilterDesc ms_audio_mixer_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
extern MSFilterDesc ms_tone_detector_desc;
extern MSFilterDesc ms_speex_dec_desc;
extern MSFilterDesc ms_speex_enc_desc;
......@@ -50,7 +45,7 @@ extern MSFilterDesc ms_vp8_dec_desc;
extern MSFilterDesc ms_l16_enc_desc;
extern MSFilterDesc ms_l16_dec_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -58,16 +53,11 @@ MSFilterDesc * ms_filter_descs[]={
&ms_rtp_send_desc,
&ms_rtp_recv_desc,
&ms_dtmf_gen_desc,
&ms_tee_desc,
&ms_conf_desc,
&ms_join_desc,
&ms_volume_desc,
&ms_void_sink_desc,
&ms_equalizer_desc,
&ms_channel_adapter_desc,
&ms_audio_mixer_desc,
&ms_itc_source_desc,
&ms_itc_sink_desc,
&ms_tone_detector_desc,
&ms_speex_dec_desc,
&ms_speex_enc_desc,
......
EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
NULL
};
......@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
extern MSFilterDesc ms_gsm_dec_desc;
extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_speex_ec_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
......@@ -26,11 +25,10 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_equalizer_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -45,7 +43,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_gsm_dec_desc,
&ms_gsm_enc_desc,
&ms_speex_ec_desc,
&ms_tee_desc,
&ms_conf_desc,
//&alsa_write_desc,
//&alsa_read_desc,
......@@ -57,7 +54,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&ms_join_desc,
#ifndef DISABLE_RESAMPLE
&ms_resample_desc,
#endif
......@@ -65,4 +61,3 @@ MSFilterDesc * ms_filter_descs[]={
&ms_equalizer_desc,
NULL
};
SUBDIRS=mediastream
EXTRA_DIST=alldescs.h mediastreamer2.sln mediastreamer2.vcproj videodisplay.vcproj
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.sln mediastreamer2.vcproj videodisplay.vcproj
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
&ms_itc_source_desc,
NULL
};
......@@ -371,6 +371,10 @@
RelativePath="..\..\src\msvideo.c"
>
</File>
<File
RelativePath="..\..\src\msvoip.c"
>
</File>
<File
RelativePath="..\..\src\msvolume.c"
>
......@@ -462,11 +466,11 @@
>
</File>
<File
RelativePath=".\alldescs.h"
RelativePath="..\..\include\mediastreamer2\allfilters.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\allfilters.h"
RelativePath=".\basedescs.h"
>
</File>
<File
......@@ -593,6 +597,10 @@
RelativePath="..\..\src\vfw-missing.h"
>
</File>
<File
RelativePath=".\voipdescs.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\waveheader.h"
>
......
......@@ -14,8 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
extern MSFilterDesc ms_gsm_dec_desc;
extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_speex_ec_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_conf_desc;
extern MSFilterDesc ms_v4w_desc;
extern MSFilterDesc ms_video_out_desc;
......@@ -34,7 +32,6 @@ extern MSFilterDesc ms_mjpeg_enc_desc;
extern MSFilterDesc ms_mjpeg_dec_desc;
extern MSFilterDesc ms_size_conv_desc;
extern MSFilterDesc ms_pix_conv_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_static_image_desc;
......@@ -42,8 +39,6 @@ extern MSFilterDesc ms_mire_desc;
extern MSFilterDesc ms_vfw_desc;
extern MSFilterDesc ms_equalizer_desc;
extern MSFilterDesc ms_dd_display_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
extern MSFilterDesc ms_audio_mixer_desc;
extern MSFilterDesc ms_ext_display_desc;
extern MSFilterDesc ms_jpeg_writer_desc;
......@@ -55,7 +50,7 @@ extern MSFilterDesc ms_l16_dec_desc;
extern MSFilterDesc ms_g722_enc_desc;
extern MSFilterDesc ms_g722_dec_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -70,8 +65,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_gsm_dec_desc,
&ms_gsm_enc_desc,
&ms_speex_ec_desc,
&ms_tee_desc,
&ms_void_sink_desc,
&ms_conf_desc,
&ms_h263_old_enc_desc,
&ms_h263_old_dec_desc,
......@@ -88,7 +81,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_mjpeg_dec_desc,
&ms_size_conv_desc,
&ms_pix_conv_desc,
&ms_join_desc,
#ifndef NORESAMPLE
&ms_resample_desc,
#endif
......@@ -97,8 +89,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_mire_desc,
&ms_equalizer_desc,
&ms_dd_display_desc,
&ms_itc_source_desc,
&ms_itc_sink_desc,
&ms_audio_mixer_desc,
&ms_ext_display_desc,
&ms_tone_detector_desc,
......
EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastreamer2.def
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.def
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
NULL
};
......@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
//extern MSFilterDesc ms_gsm_dec_desc;
//extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_speex_ec_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
......@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_void_sink_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_gsm_dec_desc,
//&ms_gsm_enc_desc,
&ms_speex_ec_desc,
&ms_tee_desc,
&ms_conf_desc,
//&alsa_write_desc,
//&alsa_read_desc,
......@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&ms_join_desc,
&ms_resample_desc,
&ms_volume_desc,
&ms_void_sink_desc,
NULL
};
EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def
EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
NULL
};
......@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
//extern MSFilterDesc ms_gsm_dec_desc;
//extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_speex_ec_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
......@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_void_sink_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_gsm_dec_desc,
//&ms_gsm_enc_desc,
&ms_speex_ec_desc,
&ms_tee_desc,
&ms_conf_desc,
//&alsa_write_desc,
//&alsa_read_desc,
......@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&ms_join_desc,
&ms_resample_desc,
&ms_volume_desc,
&ms_void_sink_desc,
NULL
};
......@@ -45,7 +45,7 @@ AC_SUBST([mkdir_p])
AC_MSG_CHECKING([warning make an error on compilation])
AC_ARG_ENABLE(strict,
[ --enable-strict Enable error on compilation warning [default=no]],
[AS_HELP_STRING([--enable-strict], [Enable error on compilation warning (default=no)])],
[wall_werror=$enableval],
[wall_werror=yes]
)
......@@ -54,7 +54,7 @@ CFLAGS="-DORTP_INET6 $CFLAGS "
dnl enable ipv6 support
AC_ARG_ENABLE(ipv6,
[ --enable-ipv6 Turn on ipv6 support],
[AS_HELP_STRING([--enable-ipv6], [Turn on IPv6 support (default=yes)])],
[case "${enableval}" in
yes) ipv6=true;;
no) ipv6=false;;
......@@ -66,7 +66,7 @@ fi
dnl enable timestamp support
AC_ARG_ENABLE(ntp-timestamp,
[ --enable-ntp-timestamp Turn on NTP timestamping on received packet],
[AS_HELP_STRING([--enable-ntp-timestamp], [Turn on NTP timestamping on received packet (default=no)])],
[case "${enableval}" in
yes) ntptimestamp=true;;
no) ntptimestamp=false;;
......@@ -218,7 +218,7 @@ fi
dnl prefer fixed point computations
AC_ARG_ENABLE(fixed_point,
[ --enable-fixed-point Turn on fixed point computations (default: guess)],
[AS_HELP_STRING([--enable-fixed-point=@<:@yes/no/guess@:>@], [Turn on fixed point computations (default=guess)])],
[case "${enableval}" in
yes) fixed_point=true;;
no) fixed_point=false;;
......@@ -254,8 +254,6 @@ PKG_PROG_PKG_CONFIG()
AC_SUBST(MSPLUGINS_CFLAGS)
AC_SUBST(MSPLUGINS_LIBS)
AC_CHECK_LIB(rt,clock_gettime,[LIBS="$LIBS -lrt"])
dnl *********************************
dnl various checks for soundcard apis
dnl *********************************
......@@ -267,7 +265,7 @@ if test x$mingw_found = xyes ; then
fi
AC_ARG_ENABLE(sound,
[ --disable-sound Turn off all possible sound backend (default=no)],
[AS_HELP_STRING([--disable-sound], [Turn off all possible sound backend (default=no)])],
[case "${enableval}" in
yes) use_sound=true ;;
no) use_sound=false ;;
......@@ -275,7 +273,7 @@ AC_ARG_ENABLE(sound,
esac],[use_sound=true])
AC_ARG_ENABLE(oss,
[ --enable-oss Enable oss support],
[AS_HELP_STRING([--enable-oss], [Enable oss support])],
[case "${enableval}" in
yes) oss=true ;;
no) oss=false ;;
......@@ -298,7 +296,7 @@ AM_CONDITIONAL(BUILD_OSS, test x$oss = xtrue)
dnl conditionnal build of ALSA support
AC_ARG_ENABLE(alsa,
[ --enable-alsa Turn on alsa native support compiling],
[AS_HELP_STRING([--enable-alsa], [Turn on alsa native support compiling])],
[case "${enableval}" in
yes) alsa=true ;;
no) alsa=false ;;
......@@ -322,7 +320,7 @@ AM_CONDITIONAL(BUILD_ALSA, test x$alsa_enabled = xtrue)
AC_ARG_ENABLE(artsc,
[ --enable-artsc Turn on artsc (kde<4) sound input/output (no) ],
[AS_HELP_STRING([--enable-artsc], [Turn on artsc (KDE<4) sound input/output (default=no)])],
[case "${enableval}" in
yes) artsc=true ;;
no) artsc=false ;;
......@@ -360,7 +358,7 @@ fi
AM_CONDITIONAL(BUILD_ARTS, test x$arts_enabled = xtrue)
AC_ARG_ENABLE(portaudio,
[ --enable-portaudio Turn on portaudio native support compiling],
[AS_HELP_STRING([--enable-portaudio], [Turn on portaudio native support compiling (default=no)])],
[case "${enableval}" in
yes) portaudio=true ;;
no) portaudio=false ;;
......@@ -383,7 +381,7 @@ AC_SUBST(PORTAUDIO_LIBS)
AM_CONDITIONAL(BUILD_PORTAUDIO, test x$portaudio_enabled = xtrue)
AC_ARG_ENABLE(macsnd,
[ --enable-macsnd Turn on Audio Units macosx sound support (default=yes)],
[AS_HELP_STRING([--enable-macsnd], [Turn on MAC OS X Audio Units sound support])],
[case "${enableval}" in
yes) macsnd=true ;;
no) macsnd=false ;;
......@@ -396,7 +394,7 @@ if test "$ios_found" = "yes" ; then
fi
AC_ARG_ENABLE(macaqsnd,
[ --enable-macaqsnd Turn on native macosx Audio Queue sound support (default=no)],
[AS_HELP_STRING([--enable-macaqsnd], [Turn on native MAC OS X Audio Queue sound support (default=no)])],
[case "${enableval}" in
yes) macaqsnd=true ;;
no) macaqsnd=false ;;
......@@ -425,7 +423,7 @@ AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd = xtrue)
AM_CONDITIONAL(BUILD_IOSIOUNIT, test x$ios_found = xyes)
AC_ARG_ENABLE(pulseaudio,
[ --disable-pulseaudio Disable pulseaudio support],
[AS_HELP_STRING([--disable-pulseaudio], [Disable pulseaudio support])],
[case "${enableval}" in
yes) pulseaudio=true ;;
no) pulseaudio=false ;;
......@@ -455,7 +453,7 @@ dnl check for various codecs libraries
dnl *************************************
AC_ARG_ENABLE(speex,
[ --disable-speex Disable speex support],
[AS_HELP_STRING([--disable-speex], [Disable speex support])],
[case "${enableval}" in
yes) speex=true ;;
no) speex=false ;;
......@@ -487,7 +485,7 @@ AM_CONDITIONAL(BUILD_SPEEX, test x$build_speex = xyes )
AM_CONDITIONAL(BUILD_RESAMPLE, test x$build_resample = xyes )
AC_ARG_ENABLE(gsm,
[ --disable-gsm Disable gsm support],
[AS_HELP_STRING([--disable-gsm], [Disable gsm support])],
[case "${enableval}" in
yes) gsm=true ;;
no) gsm=false ;;
......@@ -519,7 +517,7 @@ fi
dnl check for spandsp support to bring up g726 codec
AC_ARG_ENABLE(spandsp,
[ --disable-spandsp Disable spandsp support],
[AS_HELP_STRING([--disable-spandsp], [Disable spandsp support])],