[MPlayer-cvslog] CVS: main cfg-mencoder.h, 1.96, 1.97 mencoder.c, 1.281, 1.282 Makefile, 1.321, 1.322 configure, 1.993, 1.994

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	cfg-mencoder.h mencoder.c Makefile configure 
Log Message:
added twolame mp2 audio encoder

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- cfg-mencoder.h	25 Apr 2005 07:07:57 -0000	1.96
+++ cfg-mencoder.h	7 May 2005 14:50:14 -0000	1.97
@@ -33,6 +33,10 @@
 extern m_option_t toolameopts_conf[];
 #endif
 
+#ifdef HAVE_TWOLAME
+extern m_option_t twolameopts_conf[];
+#endif
+
 #ifdef HAVE_FAAC
 extern m_option_t faacopts_conf[];
 #endif
@@ -119,6 +123,11 @@
 #else
 	{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
+#ifdef HAVE_TWOLAME
+	{"twolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TWOLAME, NULL},
+#else
+	{"twolame", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
 #ifdef HAVE_FAAC
 	{"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
 #else
@@ -136,8 +145,11 @@
 #ifdef HAVE_TOOLAME
 	"   toolame  - Toolame MP2 audio encoder\n"
 #endif
+#ifdef HAVE_TWOLAME
+	"   twolame  - Twolame MP2 audio encoder\n"
+#endif
 #ifdef HAVE_FAAC
-	"   faac  - FAAC AAC audio encoder\n"
+	"   faac     - FAAC AAC audio encoder\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
@@ -256,6 +268,11 @@
 #else
 	{"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
+#ifdef HAVE_TWOLAME
+	{"twolameopts", twolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+#else
+	{"twolameopts", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
 #ifdef HAVE_FAAC
 	{"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- mencoder.c	25 Apr 2005 07:07:57 -0000	1.281
+++ mencoder.c	7 May 2005 14:50:14 -0000	1.282
@@ -18,6 +18,7 @@
 #define ACODEC_LAVC 4
 #define ACODEC_TOOLAME 5
 #define ACODEC_FAAC 6
+#define ACODEC_TWOLAME 7
 
 #include <stdio.h>
 #include <stdlib.h>

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- Makefile	25 Apr 2005 07:07:57 -0000	1.321
+++ Makefile	7 May 2005 14:50:14 -0000	1.322
@@ -41,6 +41,10 @@
 CODEC_LIBS += $(TOOLAME_LIB)
 endif
 
+ifeq ($(TWOLAME),yes)
+CODEC_LIBS += $(TWOLAME_LIB)
+endif
+
 ifeq ($(FAAC),yes)
 CODEC_LIBS += $(FAAC_LIB)
 endif

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- configure	5 May 2005 17:10:15 -0000	1.993
+++ configure	7 May 2005 14:50:14 -0000	1.994
@@ -222,6 +222,7 @@
   --disable-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
   --disable-mad          disable libmad (MPEG audio) support [autodetect]
   --disable-toolame      disable Toolame (MPEG layer 2 audio) support in mencoder [autodetect]
+  --disable-twolame      disable Twolame (MPEG layer 2 audio) support in mencoder [autodetect]
   --enable-xmms          build with XMMS inputplugin support [disabled]
   --disable-mp3lib       disable builtin mp3lib [enabled]
   --disable-liba52       disable builtin liba52 [enabled]
@@ -1325,6 +1326,7 @@
 _liblzo=auto
 _mad=auto
 _toolame=auto
+_twolame=auto
 _tremor_internal=yes
 _tremor_low=no
 _vorbis=auto
@@ -1510,6 +1512,7 @@
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
   --disable-toolame)	_toolame=no	;;
+  --disable-twolame)	_twolame=no	;;
   --enable-liblzo)	_liblzo=yes	;;
   --disable-liblzo)	_liblzo=no		;;
   --enable-vorbis)	_vorbis=yes	;;
@@ -5184,6 +5187,26 @@
   echores "$_toolame (using $_toolamedir)"
 fi
 
+echocheck "Twolame"
+if test "$_twolame" = auto ; then
+  cat > $TMPC <<EOF
+#include <twolame.h>
+int main(void) { twolame_init(); return 0; }
+EOF
+  _twolame=no
+  _twolame_lib="-ltwolame"
+  cc_check $_twolame_lib $_ld_lm && _twolame=yes
+fi
+if test "$_twolame" = yes ; then
+  _def_twolame='#define HAVE_TWOLAME 1'
+  _codecmodules="$_codecmodules twolame"
+else
+  _def_toolame='#undef HAVE_TWOLAME'
+  _twolame_lib=""
+  _nocodecmodules="twolame $_nocodecmodules"
+fi
+echores "$_twolame"
+
 echocheck "OggVorbis support"
 if test "$_tremor_internal" = yes; then
   _vorbis=yes
@@ -6899,6 +6922,8 @@
 TOOLAME=$_toolame
 TOOLAME_EXTRAFLAGS=$_toolame_extraflags
 TOOLAME_LIB=$_toolame_lib
+TWOLAME=$_twolame
+TWOLAME_LIB=$_twolame_lib
 FAAC=$_faac
 FAAC_LIB=$_ld_faac
 AMR_NB=$_amr_nb
@@ -7551,6 +7576,7 @@
 $_def_caca
 $_def_tga
 $_def_toolame
+$_def_twolame
 
 /* used by GUI: */
 $_def_xshape