[vlc-commits] adaptive: use demux path rather than stream filter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 26 12:47:42 2015 +0300| [4501129eb06f6aa81eda3bcc0c6b1c4a841e4569] | committer: Rémi Denis-Courmont

adaptive: use demux path rather than stream filter

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

 modules/demux/adaptative/adaptative.cpp |    2 +-
 modules/demux/dash/DASHManager.cpp      |    4 ++--
 modules/demux/hls/HLSManager.cpp        |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/demux/adaptative/adaptative.cpp b/modules/demux/adaptative/adaptative.cpp
index 6dc4f94..2820b26 100644
--- a/modules/demux/adaptative/adaptative.cpp
+++ b/modules/demux/adaptative/adaptative.cpp
@@ -162,7 +162,7 @@ static int Open(vlc_object_t *p_obj)
     p_demux->pf_demux      = p_manager->demux_callback;
     p_demux->pf_control    = p_manager->control_callback;
 
-    msg_Dbg(p_obj,"opening playlist file (%s)", p_demux->s->psz_path);
+    msg_Dbg(p_obj,"opening playlist file (%s)", p_demux->psz_location);
 
     return VLC_SUCCESS;
 }
diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index 18bafb4..dbde53e 100644
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -85,9 +85,9 @@ bool DASHManager::updatePlaylist()
     /* do update */
     if(nextPlaylistupdate)
     {
-        std::string url(p_demux->s->psz_access);
+        std::string url(p_demux->psz_access);
         url.append("://");
-        url.append(p_demux->s->psz_path);
+        url.append(p_demux->psz_location);
 
         uint8_t *p_data = NULL;
         size_t i_data = Retrieve::HTTP(VLC_OBJECT(p_demux->s), url, (void**) &p_data);
diff --git a/modules/demux/hls/HLSManager.cpp b/modules/demux/hls/HLSManager.cpp
index fa1987d..a8b6d01 100644
--- a/modules/demux/hls/HLSManager.cpp
+++ b/modules/demux/hls/HLSManager.cpp
@@ -137,9 +137,9 @@ bool HLSManager::updatePlaylist()
     /* do update */
     if(nextPlaylistupdate)
     {
-        std::string url(p_demux->s->psz_access);
+        std::string url(p_demux->psz_access);
         url.append("://");
-        url.append(p_demux->s->psz_path);
+        url.append(p_demux->psz_location);
 
         uint8_t *p_data = NULL;
         size_t i_data = Retrieve::HTTP(VLC_OBJECT(p_demux->s), url, (void**) &p_data);