github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 21:07:29 +01:00
Code Releases Activity

-dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1019 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lgb 2001-06-05 02:13:31 +00:00
parent 071bee3967
commit 54441167f7
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cfg-mplayer.h
View File

@ -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

2
dvdauth.c
View File

@ -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;

2
dvdauth.h
View File

@ -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;

4
mplayer.c
View File

@ -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);
}