[MPlayer-cvslog] CVS: main configure, 1.1133, 1.1134 Makefile, 1.340, 1.341 ChangeLog, 1.288, 1.289

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4691

Modified Files:
	configure Makefile ChangeLog 
Log Message:
OpenAL audio support, actual output is mono-only (no positioning yet).


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -r1.1133 -r1.1134
--- configure	14 Feb 2006 21:43:32 -0000	1.1133
+++ configure	16 Feb 2006 20:45:24 -0000	1.1134
@@ -316,6 +316,7 @@
   --disable-esd          disable esd sound support [autodetect]
   --disable-polyp        disable Polypaudio sound support [autodetect]
   --disable-jack         disable JACK sound support [autodetect]
+  --disable-openal       disable OpenAL sound support [autodetect]
   --disable-nas          disable NAS sound support [autodetect]
   --disable-sgiaudio     disable SGI sound support [autodetect]
   --disable-sunaudio     disable Sun sound support [autodetect]
@@ -1508,6 +1509,7 @@
 _esd=auto
 _polyp=auto
 _jack=auto
+_openal=auto
 _libcdio=auto
 _liblzo=auto
 _mad=auto
@@ -1703,6 +1705,8 @@
   --disable-polyp)	_polyp=no		;;
   --enable-jack)	_jack=yes	;;
   --disable-jack)	_jack=no	;;
+  --enable-openal)	_openal=yes	;;
+  --disable-openal)	_openal=no	;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
   --disable-toolame)	_toolame=no	;;
@@ -4797,6 +4801,30 @@
 fi
 echores "$_jack"
 
+echocheck "OpenAL"
+if test "$_openal" = auto ; then
+  _openal=no
+cat > $TMPC << EOF
+#include <AL/al.h>
+int main(void) {
+  alSourceQueueBuffers(0, 0, 0);
+//  alGetSourcei(0, AL_SAMPLE_OFFSET, 0);
+  return 0;
+}
+EOF
+  if cc_check -lopenal ; then
+    _ld_openal="-lopenal"
+    _openal=yes
+  fi
+fi
+if test "$_openal" = yes ; then
+  _def_openal='#define USE_OPENAL 1'
+  _aosrc="$_aosrc ao_openal.c"
+  _aomodules="openal $_aomodules"
+else
+  _noaomodules="openal $_noaomodules"
+fi
+echores "$_openal"
 
 echocheck "ALSA audio"
 if test "$_alsa" != no ; then
@@ -7253,6 +7281,8 @@
 POLYP_INC = $_inc_polyp
 JACK_LIB = $_ld_jack
 JACK_INC = $_inc_jack
+OPENAL_LIB = $_ld_openal
+OPENAL_INC = $_inc_openal
 SGIAUDIO_LIB = $_ld_sgiaudio
 
 # input/demuxer/codecs
@@ -7742,6 +7772,7 @@
 $_def_esd_latency
 $_def_polyp
 $_def_jack
+$_def_openal
 $_def_sys_asoundlib_h
 $_def_alsa_asoundlib_h
 $_def_sunaudio

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- Makefile	12 Feb 2006 14:50:05 -0000	1.340
+++ Makefile	16 Feb 2006 20:45:24 -0000	1.341
@@ -83,6 +83,7 @@
 AO_LIBS = $(ARTS_LIB) \
           $(ESD_LIB) \
           $(JACK_LIB) \
+          $(OPENAL_LIB) \
           $(NAS_LIB) \
           $(SGIAUDIO_LIB) \
           $(POLYP_LIB) \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- ChangeLog	13 Feb 2006 11:15:24 -0000	1.288
+++ ChangeLog	16 Feb 2006 20:45:24 -0000	1.289
@@ -27,6 +27,7 @@
 
     Drivers:
     * JACK audio output rewritten without bio2jack
+    * OpenAL audio output - unfinished, can only do mono output
     * OpenGL video output modules support -geometry and -wid options
     * for -vo gl manyfmts is now default (since it is a lot faster), use
       -vo gl:nomanyfmts if it does not work for you