Commit a0af84c5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

dvdnav: skip probing if forced and do not accept "file://"

parent 3ac3e139
...@@ -190,11 +190,16 @@ static int Open( vlc_object_t *p_this ) ...@@ -190,11 +190,16 @@ static int Open( vlc_object_t *p_this )
int i_angle; int i_angle;
char *psz_file; char *psz_file;
char *psz_code; char *psz_code;
bool forced = false;
if( p_demux->psz_access != NULL
&& !strncmp(p_demux->psz_access, "dvd", 3) )
forced = true;
if( !p_demux->psz_file || !*p_demux->psz_file ) if( !p_demux->psz_file || !*p_demux->psz_file )
{ {
/* Only when selected */ /* Only when selected */
if( !p_demux->psz_access || !*p_demux->psz_access ) if( !forced )
return VLC_EGENERIC; return VLC_EGENERIC;
psz_file = var_InheritString( p_this, "dvd" ); psz_file = var_InheritString( p_this, "dvd" );
...@@ -217,7 +222,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -217,7 +222,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
/* Try some simple probing to avoid going through dvdnav_open too often */ /* Try some simple probing to avoid going through dvdnav_open too often */
if( ProbeDVD( psz_file ) != VLC_SUCCESS ) if( !forced && ProbeDVD( psz_file ) != VLC_SUCCESS )
{ {
free( psz_file ); free( psz_file );
return VLC_EGENERIC; return VLC_EGENERIC;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment