[MPlayer-cvslog] r23010 - trunk/cfg-common.h

[Rich Felker]

On Tue, Apr 17, 2007 at 09:04:53AM +0200, rfelker wrote:
> Author: rfelker
> Date: Tue Apr 17 09:04:53 2007
> New Revision: 23010
> 
> Modified:
>    trunk/cfg-common.h
> 
> Log:
> 5l: don't die when config file contains dvd options and dvd support is missing
> 
> Modified: trunk/cfg-common.h
> ==============================================================================
> --- trunk/cfg-common.h	(original)
> +++ trunk/cfg-common.h	Tue Apr 17 09:04:53 2007
> @@ -31,8 +31,8 @@
>  	{"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
>  	{"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
>  #else
> -	{"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> -	{"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> +	{"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
> +	{"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},

While this patch is still correct, it's incomplete; CONF_TYPE_PRINT
already causes MPlayer to die. :(

IMO these options in the #else clause only cause compatibility
problems between versions of MPlayer with different compiletime
options, and should be removed. You'll already get an error from using
dvd:// if you don't have DVD support; there's no reason for
-dvd-device and -dvd-speed to result in fatal errors too.

Rich