Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv8061 Modified Files: Makefile configure Log Message: Support for playing audio cds using cdparanoia. Include a raw audio demuxer wich can be used for other purpose. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- Makefile 30 May 2002 14:26:35 -0000 1.190 +++ Makefile 11 Jun 2002 14:29:45 -0000 1.191 @@ -51,11 +51,11 @@ A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) $(FAME_LIB) -COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) -lm +COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) -lm ifeq ($(VIDIX),yes) MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix endif -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall +CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC)# -Wall PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc input libmpdvdkit ifeq ($(VIDIX),yes) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.499 retrieving revision 1.500 diff -u -r1.499 -r1.500 --- configure 10 Jun 2002 16:19:46 -0000 1.499 +++ configure 11 Jun 2002 14:29:45 -0000 1.500 @@ -162,6 +162,7 @@ --disable-dvdnav Disable dvdnav support [autodetect] --disable-dvdread Disable libdvdread support [autodetect] --disable-mpdvdkit Disable mpdvdkit support [autodetect] + --disable-cdparanoia Disable cdparanoia support [autodetect] Video: --enable-gl build with OpenGL render support [autodetect] @@ -904,6 +905,7 @@ _i18n=no _sighandler=yes _libdv=auto +_cdparanoia=auto for ac_option do case "$ac_option" in @@ -1058,6 +1060,8 @@ --disable-select) _select=no ;; --enable-linux-devfs) _linux_devfs=yes ;; --disable-linux-devfs) _linux_devfs=no ;; + --enable-cdparanoia) _cdparanoia=yes ;; + --disable-cdparanoia) _cdparanoia=no ;; --enable-dga) _dga=auto ;; # as we don't know if it's 1 or 2 --enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;; @@ -1147,6 +1151,12 @@ --with-madlibdir=*) _ld_mad=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ;; + --with-cdparanoiaincdir=*) + _inc_cdparanoia=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` + ;; + --with-cdparanoialibdir=*) + _ld_cdparanoia=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` + ;; --prefix=*) _prefix=`echo $ac_option | cut -d '=' -f 2` @@ -3005,6 +3015,25 @@ echores "no" fi +echocheck "cdparanoia" +if test "$_cdparanoia" = auto ; then + cat > $TMPC <<EOF +#include <cdda_interface.h> +#include <cdda_paranoia.h> +// This need a better test. How ? +int main(void) { return 1; } +EOF + _cdparanoia=no + cc_check $_inc_cdparnoia $_ld_cdparanoia -lcdda_interface -lcdda_paranoia && _cdparanoia=yes +fi +if test "$_cdparanoia" = yes ; then + _def_cdparanoia='#define HAVE_CDDA' + _ld_cdparanoia="$_ld_cdparanoia -lcdda_interface -lcdda_paranoia" +else + _def_cdparanoia='#undef HAVE_CDDA' +fi +echores "$_cdparanoia" + echocheck "zlib" cat > $TMPC << EOF #include <zlib.h> @@ -3966,6 +3995,8 @@ DIRECTFB_INC = $_inc_directfb DIRECTFB_LIB = $_ld_directfb NEW_INPUT_LIB = $_ld_new_input +CDPARANOIA_INC = $_inc_cdparnoia +CDPARANOIA_LIB = $_ld_cdparanoia # --- Some stuff for autoconfigure ---- $_target_arch @@ -4282,6 +4313,9 @@ /* enable streaming */ $_def_streaming + +/* enables / disables cdparanoia support */ +$_def_cdparanoia /* enables / disables vidix usage */ $_def_vidix