From 8ce73ebbe0167a7a6fd3555a9fe24b4f8f3202e2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 20 Jun 2014 19:43:51 +0200
Subject: stream_dvd, stream_dvdnav: map dvd:// to dvdnav

The old stream_dvd.c implementation is still available under dvdread://.
---
 stream/stream_dvd.c    | 4 ++--
 stream/stream_dvdnav.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index a63cc41f75..0e193db78a 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -940,7 +940,7 @@ static int ifo_stream_open (stream_t *stream)
         priv->cfg_title = 0;
 
     free(filename);
-    stream->url=talloc_strdup(stream, "dvd://");
+    stream->url=talloc_strdup(stream, "dvdread://");
 
     return open_s(stream);
 }
@@ -948,7 +948,7 @@ static int ifo_stream_open (stream_t *stream)
 const stream_info_t stream_info_dvd = {
   .name = "dvd",
   .open = open_s,
-  .protocols = (const char*const[]){ "dvd", NULL },
+  .protocols = (const char*const[]){ "dvdread", NULL },
   .priv_size = sizeof(dvd_priv_t),
   .priv_defaults = &stream_priv_dflts,
   .options = stream_opts_fields,
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index b2b10d5bf4..59f10f6103 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -737,7 +737,7 @@ static int open_s(stream_t *stream)
 const stream_info_t stream_info_dvdnav = {
     .name = "dvdnav",
     .open = open_s,
-    .protocols = (const char*const[]){ "dvdnav", NULL },
+    .protocols = (const char*const[]){ "dvd", "dvdnav", NULL },
     .priv_size = sizeof(struct priv),
     .priv_defaults = &stream_priv_dflts,
     .options = stream_opts_fields,
-- 
cgit v1.2.3