[Mplayer-cvslog] CVS: main/libmpdemux dvdauth.c,1.18,1.19

[Gábor Lénárt]

On Wed, Jul 09, 2003 at 10:10:51PM +0200, Jonas Jermann CVS wrote:
> 	dvdauth.c 
> Log Message:
> -dvd -> dvd:// and -vcd -> vcd://
> 
> Index: dvdauth.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpdemux/dvdauth.c,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -r1.18 -r1.19
> --- dvdauth.c	22 Sep 2002 13:14:56 -0000	1.18
> +++ dvdauth.c	9 Jul 2003 20:10:48 -0000	1.19
> @@ -288,7 +288,7 @@
>  	}
>  
>  	if (!(*dl_CSSisEncrypted)(dvd)) {
> -		printf("DVD: DVD is unencrypted! Skipping authentication!\n(note: you should not use -dvd switch for unencrypted discs!)\n");
> +		printf("DVD: DVD is unencrypted! Skipping authentication!\n(note: you should not use dvd:// switch for unencrypted discs!)\n");
>  		DVDCloseDevice(dvd);

This is WRONG!!!!!
First of all it's the 'old-style DVD support' and it has nothing with
the dvd:// syntax, since that's the 'new-style DVD support'.
Also this diff is interesting, because you change '-dvd' to 'dvd://'.
However for real IT SHOULD BE -dvdauth and _NOT_ 'dvd://' nor '-dvd' ;-)))

Just check it:

That line is in dvdauth.c inside function dvd_auth() which is called from
mplayer.c:

#ifdef HAVE_LIBCSS
[...]
if (dvd_auth_device) {
    if (dvd_auth(dvd_auth_device,filename)) {
[...]
#endif

dvd_auth_device is filled according to cfg-common.h:

#ifdef HAVE_LIBCSS
        {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
        {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0, NULL},
        {"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0, NULL},
#else

As you can see, dvdauth.c is nothing about dvd://, since 'new stype DVD
support' command line switches are surrouneded by the USE_DVDREAD ifdef's
in cfg-common.h.

So please revert this path or even better, change to -dvdauth switch inside
the printf.

However I don't think that too many people use these stuffs nowdays ;-)

- Gábor (larta'H)