Changeset 5779
- Timestamp:
- Apr 9, 2018 12:30:48 PM (7 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r5735 r5779 763 763 oldincludedir 764 764 includedir 765 runstatedir 765 766 localstatedir 766 767 sharedstatedir … … 888 889 sharedstatedir='${prefix}/com' 889 890 localstatedir='${prefix}/var' 891 runstatedir='${localstatedir}/run' 890 892 includedir='${prefix}/include' 891 893 oldincludedir='/usr/include' … … 1140 1142 silent=yes ;; 1141 1143 1144 -runstatedir | --runstatedir | --runstatedi | --runstated \ 1145 | --runstate | --runstat | --runsta | --runst | --runs \ 1146 | --run | --ru | --r) 1147 ac_prev=runstatedir ;; 1148 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1149 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1150 | --run=* | --ru=* | --r=*) 1151 runstatedir=$ac_optarg ;; 1152 1142 1153 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1143 1154 ac_prev=sbindir ;; … … 1277 1288 datadir sysconfdir sharedstatedir localstatedir includedir \ 1278 1289 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1279 libdir localedir mandir 1290 libdir localedir mandir runstatedir 1280 1291 do 1281 1292 eval ac_val=\$$ac_var … … 1430 1441 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1431 1442 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1443 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1432 1444 --libdir=DIR object code libraries [EPREFIX/lib] 1433 1445 --includedir=DIR C header files [PREFIX/include] … … 6362 6374 ;; 6363 6375 *) 6364 ac_pjmedia_snd=alsa 6365 ac_pa_use_alsa=1 6366 6367 ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" 6376 if test "x$ac_external_pa" != "x1"; then 6377 ac_pjmedia_snd=alsa 6378 ac_pa_use_alsa=1 6379 6380 ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" 6368 6381 if test "x$ac_cv_header_alsa_version_h" = xyes; then : 6369 6382 LIBS="$LIBS -lasound" … … 6373 6386 6374 6387 6375 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&56388 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5 6376 6389 $as_echo "Checking sound device backend... unix" >&6; } 6377 6390 6378 ac_pa_use_oss=16379 6380 # Check whether --enable-oss was given.6391 ac_pa_use_oss=1 6392 6393 # Check whether --enable-oss was given. 6381 6394 if test "${enable_oss+set}" = set; then : 6382 6395 enableval=$enable_oss; 6383 if test "$enable_oss" = "no"; then6384 ac_pa_use_oss=06385 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OSS audio is disabled... yes" >&56396 if test "$enable_oss" = "no"; then 6397 ac_pa_use_oss=0 6398 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OSS audio is disabled... yes" >&5 6386 6399 $as_echo "Checking if OSS audio is disabled... yes" >&6; } 6387 fi 6388 6389 fi 6390 6400 fi 6401 6402 fi 6403 6404 fi 6391 6405 ;; 6392 6406 esac -
pjproject/trunk/aconfigure.ac
r5735 r5779 736 736 ;; 737 737 *) 738 dnl # Check if ALSA is available 739 ac_pjmedia_snd=alsa 740 AC_SUBST(ac_pa_use_alsa,1) 741 AC_CHECK_HEADER(alsa/version.h, 742 [LIBS="$LIBS -lasound"], 743 [ac_pa_use_alsa=0]) 744 AC_MSG_RESULT([Checking sound device backend... unix]) 745 746 dnl # Check if OSS is disabled 747 AC_SUBST(ac_pa_use_oss,1) 748 AC_ARG_ENABLE(oss, 749 AS_HELP_STRING([--disable-oss], 750 [Disable OSS audio (default: not disabled)]), 751 [ 752 if test "$enable_oss" = "no"; then 753 [ac_pa_use_oss=0] 754 AC_MSG_RESULT([Checking if OSS audio is disabled... yes]) 755 fi 756 ]) 738 if test "x$ac_external_pa" != "x1"; then 739 dnl # Check if ALSA is available 740 ac_pjmedia_snd=alsa 741 AC_SUBST(ac_pa_use_alsa,1) 742 AC_CHECK_HEADER(alsa/version.h, 743 [LIBS="$LIBS -lasound"], 744 [ac_pa_use_alsa=0]) 745 AC_MSG_RESULT([Checking sound device backend... unix]) 746 747 dnl # Check if OSS is disabled 748 AC_SUBST(ac_pa_use_oss,1) 749 AC_ARG_ENABLE(oss, 750 AS_HELP_STRING([--disable-oss], 751 [Disable OSS audio (default: not disabled)]), 752 [ 753 if test "$enable_oss" = "no"; then 754 [ac_pa_use_oss=0] 755 AC_MSG_RESULT([Checking if OSS audio is disabled... yes]) 756 fi 757 ]) 758 fi 757 759 ;; 758 760 esac -
pjproject/trunk/build.mak.in
r5761 r5779 116 116 endif 117 117 118 ifneq ($(findstring pa,@ac_pjmedia_snd@),)119 118 ifeq (@ac_external_pa@,1) 120 119 # External PA 121 120 APP_THIRD_PARTY_EXT += -lportaudio 122 else123 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)124 ifeq ($(PJ_SHARED_LIBRARIES),)125 APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME)126 else127 APP_THIRD_PARTY_LIBS += -lportaudio128 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX)129 endif130 endif131 121 endif 132 122 -
pjproject/trunk/pjmedia/build/os-auto.mak.in
r5656 r5779 190 190 ifeq (@ac_external_pa@,1) 191 191 # External PA 192 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 192 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 \ 193 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 193 194 endif 194 195 -
pjproject/trunk/pjmedia/src/pjmedia-audiodev/errno.c
r4613 r5779 110 110 111 111 } else 112 #endif /* PJMEDIA_ SOUND_IMPLEMENTATION*/112 #endif /* PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO */ 113 113 114 114 /* See if the error comes from WMME */ -
pjproject/trunk/pjmedia/src/pjmedia/errno.c
r5748 r5779 21 21 #include <pjmedia/types.h> 22 22 #include <pj/string.h> 23 #if defined(PJMEDIA_SOUND_IMPLEMENTATION) && \ 24 PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_PORTAUDIO_SOUND 23 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 25 24 # include <portaudio.h> 26 25 #endif … … 190 189 191 190 /* See if the error comes from PortAudio. */ 192 #if defined(PJMEDIA_SOUND_IMPLEMENTATION) && \ 193 PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_PORTAUDIO_SOUND 191 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 194 192 if (statcode >= PJMEDIA_PORTAUDIO_ERRNO_START && 195 193 statcode <= PJMEDIA_PORTAUDIO_ERRNO_END) … … 208 206 209 207 } else 210 #endif /* PJMEDIA_ SOUND_IMPLEMENTATION*/208 #endif /* PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO */ 211 209 212 210 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) -
pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c
r3553 r5779 350 350 est_extra_delay = 30; 351 351 352 #if PJMEDIA_SOUND_IMPLEMENTATION!=PJMEDIA_SOUND_NULL_SOUND352 #if !PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO 353 353 est_extra_delay += PJMEDIA_SND_DEFAULT_REC_LATENCY + 354 354 PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
Note: See TracChangeset
for help on using the changeset viewer.