[vlc-commits] taglib: use input item URI

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug  5 18:59:38 2015 +0300| [6c7179629945cdc3c19432916636a353ad041088] | committer: Rémi Denis-Courmont

taglib: use input item URI

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

 modules/meta_engine/taglib.cpp |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index e6aab0a..d0a76b1 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -669,18 +669,20 @@ static int ReadMeta( vlc_object_t* p_this)
 {
     vlc_mutex_locker locker (&taglib_lock);
     demux_meta_t*   p_demux_meta = (demux_meta_t *)p_this;
-    demux_t*        p_demux = p_demux_meta->p_demux;
     vlc_meta_t*     p_meta;
     FileRef f;
 
     p_demux_meta->p_meta = NULL;
-    if( strcmp( p_demux->psz_access, "file" ) )
-        return VLC_EGENERIC;
 
-    char *psz_path = strdup( p_demux->psz_file );
-    if( !psz_path )
+    char *psz_uri = input_item_GetURI( p_demux_meta->p_item );
+    if( unlikely(psz_uri == NULL) )
         return VLC_ENOMEM;
 
+    char *psz_path = make_path( psz_uri );
+    free( psz_uri );
+    if( psz_path == NULL )
+        return VLC_EGENERIC;
+
 #if defined(_WIN32)
     wchar_t *wpath = ToWide( psz_path );
     if( wpath == NULL )