[Mplayer-cvslog] CVS: main configure,1.355,1.356 cfg-common.h,1.19,1.20 fibmap_mplayer.c,1.2,1.3

[LGB Z]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv6850/main

Modified Files:
	configure cfg-common.h fibmap_mplayer.c 
Log Message:
Return of the 'Old-style-DVD-support', with dynamic loading (using libdl) so
no more conflict with libdvdread: you can compile in both of libdvdread and
libcss support! You can even select libcss.so to load from command line or
configuration file, with '-csslib /usr/local/lib/libcss.so' or something
similar. Default for this option is /usr/local/lib/libcss.so. Note: libcss
version (ver>0.1) with newer API is not supported in this version! This is
the first version so stay tuned :)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- configure	31 Dec 2001 15:29:46 -0000	1.355
+++ configure	4 Jan 2002 13:08:13 -0000	1.356
@@ -2069,7 +2069,31 @@
 fi
 
 
-echocheck "DVD support"
+
+
+echocheck "DVD support (libcss - old style)"
+if test "$_css" = auto ; then
+  cat > $TMPC <<EOF
+#include <types.h>
+#include <css.h>
+int main(void) { (void) CSSisEncrypted(0); return 0; }
+EOF
+  _css=no
+  cc_check -lcss $_ld_dl && _css=yes
+fi
+if test "$_css" = yes ; then
+  _def_css='#define HAVE_LIBCSS 1'
+  test "$_csslibdir" && _ld_css="-L${_csslibdir} $_ld_css"
+  _inputmodules="dvdcss $_inputmodules"
+  _largefiles=yes
+  echores "yes"
+else
+  _def_css='#undef HAVE_LIBCSS'
+  echores "no"
+fi
+
+
+echocheck "DVD support (libdvdread - new style)"
 if test "$_dvdread" = auto ; then
   cat > $TMPC << EOF
 #include <dvdread/dvd_reader.h>
@@ -2085,35 +2109,16 @@
      _dvdread=yes
   fi
 fi
-if test "$_css" = auto ; then
-  cat > $TMPC <<EOF
-#include <css.h>
-int main(void) { (void) CSSisEncrypted(0); return 0; }
-EOF
-  _css=no
-  cc_check -lcss && _css=yes
-fi
-# dvdread preferred to DeCSS
 if test "$_dvdread" = yes ; then
   _largefiles=yes
   _def_dvdread='#define USE_DVDREAD 1'
-  _def_css='#undef HAVE_LIBCSS'
   _ld_css='-ldvdread'
   _inputmodules="dvdread $_inputmodules"
-  echores "libdvdread"
-elif test "$_css" = yes ; then
-  _def_dvdread='#undef USE_DVDREAD'
-  _def_css='#define HAVE_LIBCSS 1'
-  _ld_css='-lcss'
-  test "$_csslibdir" && _ld_css="-L${_csslibdir} $_ld_css"
-  _inputmodules="dvdcss $_inputmodules"
-  echores "libcss"
+  echores "yes"
 else
   _def_dvdread='#undef USE_DVDREAD'
-  _def_css='#undef HAVE_LIBCSS'
   echores "no"
 fi
-
 
 echocheck "zlib"
 cat > $TMPC << EOF

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cfg-common.h	26 Dec 2001 19:45:44 -0000	1.19
+++ cfg-common.h	4 Jan 2002 13:08:13 -0000	1.20
@@ -22,21 +22,11 @@
 #ifdef HAVE_LIBCSS
         {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},
         {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
-//	{"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0},
 #else
-//        {"dvd", "DVD support was not compiled in. See file DOCS/DVD.\n",
-//            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#ifdef USE_DVDREAD
-        {"dvdkey", "MPlayer was compiled with libdvdread support, this option not available.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-        {"dvdauth", "MPlayer was compiled with libdvdread support! Use option -dvd !\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#else
-        {"dvdkey", "DVD support was not compiled in. See file DOCS/DVD.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-        {"dvdauth", "DVD support was not compiled in. See file DOCS/DVD.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#endif
+        {"dvdauth", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+        {"dvdkey", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #endif
 
 // ------------------------- demuxer options --------------------

Index: fibmap_mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/fibmap_mplayer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fibmap_mplayer.c	26 Sep 2001 21:35:14 -0000	1.2
+++ fibmap_mplayer.c	4 Jan 2002 13:08:13 -0000	1.3
@@ -1,3 +1,6 @@
+/* (C)2001,2002 by LGB (Gábor Lénárt), lgb at lgb.hu
+   Part of MPlayer project, this source is copyrighted according to GNU/GPL.  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,6 +33,6 @@
             return 1;
         }
 	close(fd);
-	fprintf(stderr,"%d\n",lba);
+	printf("%d\n",lba);
 	return 0;
 }