Remembers art url when an input with same artist & album needs art, so if it's a...

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index ad8259cfb1c515d6192d398b8342d140eead7c05..6cf6fd568f0572a188c2c05a22f4e3f8c13c6080 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -215,6 +215,7 @@ typedef struct playlist_album_t
 {
     char *psz_artist;
     char *psz_album;
+    char *psz_arturl;
     vlc_bool_t b_found;
 } playlist_album_t;
 

diff --git a/src/input/meta.c b/src/input/meta.c
index 988406d4f2a67bd175173b90e470e1bb1b7c2f96..410cf4ecff75c8002af8128b1a0016a2d4b12a90 100644 (file)
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -110,7 +110,7 @@ int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item )
 }
 
 /* Return codes:
- *   0 : Art is in cache
+ *   0 : Art is in cache or is a local file
  *   1 : Art found, need to download
  *  -X : Error/not found
  */
@@ -145,8 +145,10 @@ int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item )
                 free( psz_album );
                 if( album.b_found )
                 {
-                    /* Actually get URL from cache */
-                    input_FindArtInCache( p_playlist, p_item );
+                    if( !strncmp( album.psz_arturl, "file://", 7 ) )
+                        input_item_SetArtURL( p_item, album.psz_arturl );
+                    else /* Actually get URL from cache */
+                        input_FindArtInCache( p_playlist, p_item );
                     return 0;
                 }
                 else
@@ -202,6 +204,7 @@ int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item )
         playlist_album_t a;
         a.psz_artist = psz_artist;
         a.psz_album = psz_album;
+        a.psz_arturl = input_item_GetArtURL( p_item );
         a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE );
         ARRAY_APPEND( p_playlist->p_fetcher->albums, a );
     }