Changeset ecdf0f1a2575e80d1303106973d5f45e73567e10

Timestamp:

09/30/06 19:08:48 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1159636128 +0000

git-parent:

[b3b71030d8799237a448021f1054d20ea34b2504]

git-author:

Clément Stenac <zorglub@videolan.org> 1159636128 +0000

Message:

Re-enable art fetching when in "ALL" mode
Todo: we should recheck cache just before downloading in case it has been downloaded while we were in the queue

Files:

• modules/meta_engine/folder.c (modified) (2 diffs)
• modules/meta_engine/musicbrainz.c (modified) (2 diffs)
• modules/mux/mp4.c (modified) (1 diff)
• src/input/input.c (modified) (1 diff)
• src/input/meta.c (modified) (4 diffs)
• src/playlist/engine.c (modified) (2 diffs)

modules/meta_engine/folder.c

@@ -51 +51 @@
-
-vlc_module_begin();
-/*    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );*/
-    set_shortname( N_( "Folder" ) );
-    set_description( _("Folder meta data") );
@@ -64 +62 @@
-static int FindMeta( vlc_object_t *p_this )
-{
-meta_engine_t *p_me = (meta_engine
-p_me->p_item
+playlist_t *p_playlist = (playlist
+(input_item_t *)(p_playlist->p_private)
-    vlc_bool_t b_have_art = VLC_FALSE;
-    uint32_t i_meta;
-
+    int i = 0;
+    struct stat a;
+    char psz_filename[MAX_PATH];
+    char *psz_dir = strdup( p_item->psz_uri );
+    char *psz_buf = strrchr( psz_dir, '/' );
+
-    if( !p_item->p_meta ) return VLC_EGENERIC;
+    if( psz_buf )
+    {
+        psz_buf++;
+        *psz_buf = '\0';
+    }
+    else
+    {
+        *psz_dir = '\0';
+    }
-
+    for( i = 0; b_have_art == VLC_FALSE && i < 3; i++ )
+    {
+        switch( i )
+        {
+            case 0:
+            /* Windows Folder.jpg */
+            snprintf( psz_filename, MAX_PATH,
+                      "file://%sFolder.jpg", psz_dir );
+            break;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-
-for( i = 0; b_have_art == VLC_FALSE && i < 3; i++
+if( utf8_stat( psz_filename+7, &a ) != -1
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-
-        free( psz_dir );
-    }
-
-
-
-
-
-
-
-
+
+
+
-}

modules/meta_engine/musicbrainz.c

@@ -163 +163 @@
-    meta_engine_t *p_me = (meta_engine_t *)p_this;
-    input_item_t *p_item = p_me->p_item;
-
+
+
-
-    if( !i_ret )
@@ -177 +178 @@
-static int FindArt( vlc_object_t *p_this )
-{
-
-p_playlist->p_private
+ = (playlist_t *)p_this
+(p_playlist->p_private)
-    assert( p_item );
-
-p_playlist
+VLC_OBJECT(p_playlist)
-}

modules/mux/mp4.c

@@ -1048 +1048 @@
-
-        ADD_META_BOX( title, "nam" );
-        ADD_META_BOX( author, "aut" );
-        ADD_META_BOX( artist, "ART" );
-        ADD_META_BOX( genre, "gen" );

src/input/input.c

@@ -2250 +2250 @@
-
-    GET_META( title, "meta-title" );
-    GET_META( author, "meta-author" );
-    GET_META( artist, "meta-artist" );
-    GET_META( genre, "meta-genre" );

src/input/meta.c

@@ -103 +103 @@
-        {
-            msg_Dbg( p_playlist, "unable to find art" );
+            PL_UNLOCK;
-            return VLC_EGENERIC;
-        }
-        module_Unneed( p_playlist, p_module );
-        p_playlist->p_private = NULL;
+        PL_UNLOCK;
-
-        if( !p_item->p_meta->psz_arturl || !*p_item->p_meta->psz_arturl )
@@ -142 +144 @@
-        if( utf8_stat( psz_filename+7, &a ) == 0 )
-        {
-            msg_Dbg( p_playlist, "album art %s already exists in cache"
-                             , psz_filename );
-            vlc_meta_SetArtURL( p_item->p_meta, psz_filename );
-            return VLC_SUCCESS;
@@ -212 +212 @@
-        fclose( p_file );
-        stream_Delete( p_stream );
-A
+a
-        free( p_item->p_meta->psz_arturl );
-        p_item->p_meta->psz_arturl = strdup( psz_filename );
@@ -229 +229 @@
-
-    CHECK( title, TITLE )
-    CHECK( author, AUTHOR )
-    CHECK( artist, ARTIST )
-    CHECK( genre, GENRE )

src/playlist/engine.c

@@ -566 +566 @@
-                input_MetaFetch( p_playlist, p_item );
-                p_item->p_meta->i_status |= ITEM_META_FETCHED;
+                var_SetInteger( p_playlist, "item-change", p_item->i_id );
+                /*  Fetch right now */
+                if( var_GetInteger( p_playlist, "album-art" ) == ALBUM_ART_ALL )
+                {
+                    vlc_mutex_lock( &p_obj->object_lock );
+                    preparse_item_t p;
+                    p.p_item = p_item;
+                    p.b_fetch_art = VLC_TRUE;
+                    INSERT_ELEM( p_playlist->p_secondary_preparse->p_waiting,
+                                 p_playlist->p_secondary_preparse->i_waiting,
+                                 0, p );
+                    vlc_mutex_unlock( &p_obj->object_lock );
+                }
+                else
+                    vlc_gc_decref( p_item );
-            }
-            else
@@ -571 +586 @@
-                input_ArtFetch( p_playlist, p_item );
-                p_item->p_meta->i_status |= ITEM_ART_FETCHED;
-
-
-
+
+
-        }
-        vlc_mutex_lock( &p_obj->object_lock );