Commit f7bd459b authored by Petri Hintukainen's avatar Petri Hintukainen Committed by Jean-Baptiste Kempf

bluray: Accept bluray://

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent f03cb672
...@@ -553,10 +553,8 @@ static int blurayOpen(vlc_object_t *object) ...@@ -553,10 +553,8 @@ static int blurayOpen(vlc_object_t *object)
if (probeStream(p_demux) != VLC_SUCCESS) { if (probeStream(p_demux) != VLC_SUCCESS) {
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} else { } else if (!forced) {
if (!forced || !p_demux->psz_file) { return VLC_EGENERIC;
return VLC_EGENERIC;
}
} }
/* */ /* */
...@@ -593,8 +591,14 @@ static int blurayOpen(vlc_object_t *object) ...@@ -593,8 +591,14 @@ static int blurayOpen(vlc_object_t *object)
p_sys->bluray = NULL; p_sys->bluray = NULL;
} }
} else { } else {
/* store current bd path */
p_sys->psz_bd_path = strdup(p_demux->psz_file); if (!p_demux->psz_file) {
/* no path provided (bluray://). use default DVD device. */
p_sys->psz_bd_path = var_InheritString(object, "dvd");
} else {
/* store current bd path */
p_sys->psz_bd_path = strdup(p_demux->psz_file);
}
/* If we're passed a block device, try to convert it to the mount point. */ /* If we're passed a block device, try to convert it to the mount point. */
FindMountPoint(&p_sys->psz_bd_path); FindMountPoint(&p_sys->psz_bd_path);
......
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