[vlc-commits] bluray: Accept bluray://

[Petri Hintukainen]

vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Wed Jan 20 14:12:30 2016 +0200| [f7bd459be8c91a83a27d409e312101451248ed2f] | committer: Jean-Baptiste Kempf

bluray: Accept bluray://

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7bd459be8c91a83a27d409e312101451248ed2f
---

 modules/access/bluray.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 9b11ea7..8dfdc33 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -553,10 +553,8 @@ static int blurayOpen(vlc_object_t *object)
         if (probeStream(p_demux) != VLC_SUCCESS) {
             return VLC_EGENERIC;
         }
-    } else {
-        if (!forced || !p_demux->psz_file) {
-            return VLC_EGENERIC;
-        }
+    } else if (!forced) {
+        return VLC_EGENERIC;
     }
 
     /* */
@@ -593,8 +591,14 @@ static int blurayOpen(vlc_object_t *object)
             p_sys->bluray = NULL;
         }
     } 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. */
         FindMountPoint(&p_sys->psz_bd_path);