diff options
| -rw-r--r-- | cfg-mplayer.h | 7 | ||||
| -rw-r--r-- | dvdauth.c | 2 | ||||
| -rw-r--r-- | dvdauth.h | 2 | ||||
| -rw-r--r-- | mplayer.c | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 57a2b642f5..8ca7978b1c 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -46,11 +46,16 @@ struct config conf[]={ {"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 @@ -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; @@ -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; @@ -632,8 +632,8 @@ if(vcd_track){ } 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); } |