Mercurial > mplayer.hg

changeset 1018:e5fc7ec51fa3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting
author lgb
date Tue, 05 Jun 2001 02:13:31 +0000
parents 7e653295099c
children 990047bcb1b8
files cfg-mplayer.h dvdauth.c dvdauth.h mplayer.c
diffstat 4 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Tue Jun 05 01:18:20 2001 +0000
+++ b/cfg-mplayer.h	Tue Jun 05 02:13:31 2001 +0000
@@ -46,11 +46,16 @@
         {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
 	{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
 #ifdef HAVE_LIBCSS
-        {"dvd", &dvd_device, CONF_TYPE_STRING, 0, 0, 0},
+        {"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
 			    
 #ifdef HAVE_FBDEV
--- a/dvdauth.c	Tue Jun 05 01:18:20 2001 +0000
+++ b/dvdauth.c	Tue Jun 05 02:13:31 2001 +0000
@@ -20,7 +20,7 @@
 
 #include "dvdauth.h"
 
-char *dvd_device=NULL;
+char *dvd_auth_device=NULL;
 unsigned char key_disc[2048];
 unsigned char key_title[5];
 unsigned char *dvdimportkey=NULL;
--- a/dvdauth.h	Tue Jun 05 01:18:20 2001 +0000
+++ b/dvdauth.h	Tue Jun 05 02:13:31 2001 +0000
@@ -3,7 +3,7 @@
 #ifndef _MPLAYER_CSS_H
 #define _MPLAYER_CSS_H
 
-extern char *dvd_device;
+extern char *dvd_auth_device;
 extern unsigned char key_disc[];
 extern unsigned char key_title[];
 extern unsigned char *dvdimportkey;
--- a/mplayer.c	Tue Jun 05 01:18:20 2001 +0000
+++ b/mplayer.c	Tue Jun 05 02:13:31 2001 +0000
@@ -632,8 +632,8 @@
     }
     printf("DVD command line requested key is stored for descrambling.\n");
   }
-  if (dvd_device) {
-    if (dvd_auth(dvd_device,f)) {
+  if (dvd_auth_device) {
+    if (dvd_auth(dvd_auth_device,f)) {
         GUI_MSG( mplErrorDVDAuth )
         exit(0);
       }