Changeset 5199

Timestamp:

Nov 10, 2015 10:36:14 AM (9 years ago)

Author:

nanang

Message:

Re #1896: Updated default audio device backends: mingw uses WMME, linux/*nix uses alsa (if available).

Location:

pjproject/trunk

Files:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (2 diffs)
• pjmedia/build/os-auto.mak.in (modified) (2 diffs)

pjproject/trunk/aconfigure

@@ -6094 +6094 @@
         ;;
   *cygwin* | *mingw*)
-        ac_pjmedia_snd=pa_win32
+        ac_pjmedia_snd=win32
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5
 $as_echo "Checking sound device backend... win32 sound" >&6; }
@@ -6108 +6108 @@
 if test "x$ac_cv_header_alsa_version_h" = xyes; then :
   ac_pa_use_alsa=1
+
+                         ac_pjmedia_snd=alsa
 
                          LIBS="$LIBS -lasound"

pjproject/trunk/aconfigure.ac

@@ -643 +643 @@
         ;;
   *cygwin* | *mingw*)
-        ac_pjmedia_snd=pa_win32
+        ac_pjmedia_snd=win32
         AC_MSG_RESULT([Checking sound device backend... win32 sound])
         ;;
@@ -655 +655 @@
         AC_CHECK_HEADER(alsa/version.h,
                         [AC_SUBST(ac_pa_use_alsa,1)
+                         AC_SUBST(ac_pjmedia_snd,alsa)
                          LIBS="$LIBS -lasound"
                         ],

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -57 +57 @@
 #   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2)
 #   - pa_win32:         PortAudio on Win32 (WMME)
-#   - ds:               Win32 DirectSound (dsound.c)
+#   - win32:            Win32 MME (wmme_dev.c)
+#   - coreaudio:        MaxOSX CoreAudio (coreaudio_dev.m)
+#   - alsa:             Unix ALSA (alsa_dev.c)
 #   - null:             Null sound device (nullsound.c)
 #   - external:         Link with no sounddev (app will provide)
@@ -212 +214 @@
 
 #
+# Unix specific
+#
+ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),)
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+endif
+
+#
 # Windows specific
 #
 ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0
 else
 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0