[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.56,1.57 dvdauth.h,1.2,1.3 dvdauth.c,1.3,1.4 mplayer.c,1.150,1.151

[Gabor Lenart]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv6018/main

Modified Files:
	cfg-mplayer.h dvdauth.h dvdauth.c mplayer.c 
Log Message:
-dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** cfg-mplayer.h	2001/06/05 01:17:12	1.56
--- cfg-mplayer.h	2001/06/05 02:13:31	1.57
***************
*** 47,54 ****
  	{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
  #ifdef HAVE_LIBCSS
!         {"dvd", &dvd_device, CONF_TYPE_STRING, 0, 0, 0},
          {"dvdkey", &dvdimportkey, 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},
  #endif
--- 47,59 ----
  	{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
  #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},
  #else
          {"dvd", "DVD support was not compiled in. See file DOCS/DVD.\n",
+             CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
+         {"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

Index: dvdauth.h
===================================================================
RCS file: /cvsroot/mplayer/main/dvdauth.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dvdauth.h	2001/04/20 14:32:09	1.2
--- dvdauth.h	2001/06/05 02:13:31	1.3
***************
*** 4,8 ****
  #define _MPLAYER_CSS_H
  
! extern char *dvd_device;
  extern unsigned char key_disc[];
  extern unsigned char key_title[];
--- 4,8 ----
  #define _MPLAYER_CSS_H
  
! extern char *dvd_auth_device;
  extern unsigned char key_disc[];
  extern unsigned char key_title[];

Index: dvdauth.c
===================================================================
RCS file: /cvsroot/mplayer/main/dvdauth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dvdauth.c	2001/04/21 15:28:19	1.3
--- dvdauth.c	2001/06/05 02:13:31	1.4
***************
*** 21,25 ****
  #include "dvdauth.h"
  
! char *dvd_device=NULL;
  unsigned char key_disc[2048];
  unsigned char key_title[5];
--- 21,25 ----
  #include "dvdauth.h"
  
! char *dvd_auth_device=NULL;
  unsigned char key_disc[2048];
  unsigned char key_title[5];

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -r1.150 -r1.151
*** mplayer.c	2001/06/05 01:14:38	1.150
--- mplayer.c	2001/06/05 02:13:31	1.151
***************
*** 633,638 ****
      printf("DVD command line requested key is stored for descrambling.\n");
    }
!   if (dvd_device) {
!     if (dvd_auth(dvd_device,f)) {
          GUI_MSG( mplErrorDVDAuth )
          exit(0);
--- 633,638 ----
      printf("DVD command line requested key is stored for descrambling.\n");
    }
!   if (dvd_auth_device) {
!     if (dvd_auth(dvd_auth_device,f)) {
          GUI_MSG( mplErrorDVDAuth )
          exit(0);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog