Fixes album art local discovery and preparsing for directory:// subitems (refs [18129])

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 507a700830c4832e3a4aff685fbe10e4291ae4b4..34c41eec144235c0432945f3c9b48b2792635624 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -84,6 +84,9 @@ static int FindMeta( vlc_object_t *p_this )
         *psz_dir = '\0';
     }
 
+    if( !strncmp( psz_dir, "file://", 7 ) )
+        psz_dir += 7;
+
     for( i = 0; b_have_art == VLC_FALSE && i < 3; i++ )
     {
         switch( i )

diff --git a/src/input/input.c b/src/input/input.c
index e5c1c6e98523077f6187646671e169f7b6bb70bb..9f6c1b98d81aa14fa43c61859394bfb4681d34f7 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1995,6 +1995,8 @@ static int InputSourceInit( input_thread_t *p_input,
     else
     {
         psz_path = psz_dup;
+        if( !strncmp( psz_path, "file://", 7 ) )
+            psz_path += 7;
         msg_Dbg( p_input, "trying to pre-parse %s",  psz_path );
         psz_demux = "";
         psz_access = "file";