Changeset 2d90e869b49fc72111a61ee715aa081fc92d169a

Timestamp:

25/09/06 00:01:28 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1159135288 +0000

git-parent:

[e398a81bd261feaada934e7b402b5fed57646593]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1159135288 +0000

Message:

Some more (mostly) untested stuff:

• Secondary queue items now have a b_fetch_art flag
  
• You can use the playlist_AskForArtEnqueue function to ask for art from an interface. This will enqueue at the begining of the secondary queue
  
• other stuff which i don't remember :)
  
• (fix issues with previous (and unrelated) DIR_SEP commit)
  

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_playlist.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (4 diffs)
• src/input/meta.c (modified) (5 diffs)
• src/input/subtitles.c (modified) (3 diffs)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (4 diffs)
• src/playlist/playlist_internal.h (modified) (2 diffs)
• src/playlist/thread.c (modified) (4 diffs)

include/vlc_common.h

@@ -238 +238 @@
-typedef struct playlist_add_t playlist_add_t;
-typedef struct playlist_preparse_t playlist_preparse_t;
+typedef struct playlist_secondary_preparse_t playlist_secondary_preparse_t;
-
-/* Modules */
@@ -1281 +1282 @@
-
-#if defined( WIN32 ) || defined( UNDER_CE )
+#   define DIR_SEP_CHAR '\\'
-#   define DIR_SEP "\\"
-#else
+#   define DIR_SEP_CHAR '/'
-#   define DIR_SEP "/"
-#endif

include/vlc_input.h

@@ -477 +477 @@
-#define input_MetaFetch(a,b) __input_MetaFetch(VLC_OBJECT(a),b)
-VLC_EXPORT( int, __input_MetaFetch, ( vlc_object_t *, input_item_t * ) );
+#define input_ArtFetch(a,b) __input_ArtFetch(VLC_OBJECT(a),b)
+VLC_EXPORT( int, __input_ArtFetch, ( vlc_object_t *, input_item_t * ) );
-
-enum input_query_e

include/vlc_playlist.h

@@ -146 +146 @@
-    mtime_t               i_sout_destroyed_date;
-    playlist_preparse_t  *p_preparse; /**< Preparser object */
-preparse_t  *p_secondary_preparse; 
+secondary_preparse_t *p_secondary_preparse;
-
-    vlc_mutex_t gc_lock;         /**< Lock to protect the garbage collection */
@@ -238 +238 @@
-VLC_EXPORT( int, playlist_PreparseEnqueue, (playlist_t *, input_item_t *) );
-VLC_EXPORT( int, playlist_PreparseEnqueueItem, (playlist_t *, playlist_item_t *) );
+VLC_EXPORT( int, playlist_AskForArtEnqueue, (playlist_t *, input_item_t *) );
-
-/* Services discovery */

include/vlc_symbols.h

@@ -547 +547 @@
-    int (*input_DownloadAndCacheArt_inner) (vlc_object_t *p_parent, input_item_t *p_item);
-    uint32_t (*input_GetMetaEngineFlags_inner) (vlc_meta_t *p_meta);
+    int (*__input_ArtFetch_inner) (vlc_object_t *, input_item_t *);
+    void *input_AskForArt_deprecated;
+    int (*playlist_AskForArtEnqueue_inner) (playlist_t *, input_item_t *);
-};
-# if defined (__PLUGIN__)
@@ -1023 +1026 @@
-#  define input_DownloadAndCacheArt (p_symbols)->input_DownloadAndCacheArt_inner
-#  define input_GetMetaEngineFlags (p_symbols)->input_GetMetaEngineFlags_inner
+#  define __input_ArtFetch (p_symbols)->__input_ArtFetch_inner
+#  define playlist_AskForArtEnqueue (p_symbols)->playlist_AskForArtEnqueue_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1502 +1507 @@
-    ((p_symbols)->input_DownloadAndCacheArt_inner) = input_DownloadAndCacheArt; \
-    ((p_symbols)->input_GetMetaEngineFlags_inner) = input_GetMetaEngineFlags; \
+    ((p_symbols)->__input_ArtFetch_inner) = __input_ArtFetch; \
+    ((p_symbols)->playlist_AskForArtEnqueue_inner) = playlist_AskForArtEnqueue; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
@@ -1555 +1562 @@
-    (p_symbols)->streaming_ChainToPsz_deprecated = NULL; \
-    (p_symbols)->__input_SecondaryPreparse_deprecated = NULL; \
+    (p_symbols)->input_AskForArt_deprecated = NULL; \
-
-# endif /* __PLUGIN__ */

src/input/meta.c

@@ -33 +33 @@
-#endif
-
-
+InCache
-
-int __input_MetaFetch( vlc_object_t *p_parent, input_item_t *p_item )
@@ -56 +56 @@
-    }
-
-
+InCache
-
-    i_meta = input_GetMetaEngineFlags( p_item->p_meta );
@@ -88 +88 @@
-}
-
+int __input_ArtFetch( vlc_object_t *p_parent, input_item_t *p_item )
+{
+    if( !p_item->p_meta )
+        return VLC_EGENERIC;
+
+    /* TODO: call art fetcher modules */
+
+    if( !p_item->p_meta->psz_arturl || !*p_item->p_meta->psz_arturl )
+        return VLC_EGENERIC;
+
+    if( strncmp( "file://", p_item->p_meta->psz_arturl, 7 ) )
+    {
+        return input_DownloadAndCacheArt( p_parent, p_item );
+    }
+    return VLC_SUCCESS;
+}
+
-#ifndef MAX_PATH
-#   define MAX_PATH 250
-#endif
-
+InCache
-{
-    char *psz_artist;
-    char *psz_album;
-    char *psz_type;
-    char psz_filename[MAX_PATH];
-    int i;
-    struct stat a;
-
+*
-
-    if( !p_item->p_meta ) return VLC_EGENERIC;
@@ -112 +128 @@
-                  DIR_SEP "%s" DIR_SEP "%s" DIR_SEP "art%s",
-                  p_parent->p_libvlc->psz_homedir,
-sz_type
+psz_type[i]
-
-        /* Check if file exists */
@@ -119 +135 @@
-            msg_Dbg( p_parent, "album art %s already exists in cache"
-                             , psz_filename );
+            vlc_meta_SetArtURL( p_item->p_meta, psz_filename );
-            return VLC_SUCCESS;
-        }

src/input/subtitles.c

@@ -223 +223 @@
-                             psz_subdir,
-                             psz_subdir[strlen(psz_subdir) - 1] ==
- ? '\0' : DIR_SEP
+_CHAR ? '\0' : DIR_SEP_CHAR
-                    subdirs[i] = psz_temp;
-                    i++;
@@ -278 +278 @@
-
-    /* extract filename & dirname from psz_fname */
-
+_CHAR
-    if( tmp )
-    {
@@ -305 +305 @@
-        dirlen = strlen( f_dir );
-        f_dir = (char *)realloc(f_dir, dirlen +2 );
-
+_CHAR
-        f_dir[dirlen+1] = '\0';
-        f_fname = FromLocaleDup( psz_fname );

src/playlist/control.c

@@ -215 +215 @@
-}
-
+int playlist_AskForArtEnqueue( playlist_t *p_playlist,
+                              input_item_t *p_item )
+{
+    int i;
+    preparse_item_t p;
+    p.p_item = p_item;
+    p.b_fetch_art = VLC_TRUE;
+
+    vlc_mutex_lock( &p_playlist->p_secondary_preparse->object_lock );
+    for( i = 0; i < p_playlist->p_secondary_preparse->i_waiting &&
+         p_playlist->p_secondary_preparse->p_waiting->b_fetch_art == VLC_TRUE;
+         i++ );
+    vlc_gc_incref( p_item );
+    INSERT_ELEM( p_playlist->p_secondary_preparse->p_waiting,
+                 p_playlist->p_secondary_preparse->i_waiting,
+                 i,
+                 p );
+    vlc_mutex_unlock( &p_playlist->p_secondary_preparse->object_lock );
+    return VLC_SUCCESS;
+}
+
-void PreparseEnqueueItemSub( playlist_t *p_playlist,
-                             playlist_item_t *p_item )

src/playlist/engine.c

@@ -460 +460 @@
-        {
-            vlc_bool_t b_preparsed = VLC_FALSE;
+            preparse_item_t p;
-            if( strncmp( p_current->psz_uri, "http:", 5 ) &&
-                strncmp( p_current->psz_uri, "rtsp:", 5 ) &&
@@ -489 +490 @@
-             *       - don't do this for things we won't get meta for, like
-             *         videos
+             * -> done in input_MetaFetch atm
-             */
-
+/*
-                && p_current->p_meta->psz_artist &&
-                   *p_current->p_meta->psz_artist) )
-
+
+
+
-                vlc_mutex_lock( &p_playlist->p_secondary_preparse->object_lock);
-p
+
-                             p_playlist->p_secondary_preparse->i_waiting,
-                             p_playlist->p_secondary_preparse->i_waiting,
-_current
+
-                vlc_mutex_unlock(
-                            &p_playlist->p_secondary_preparse->object_lock);
-
+/*
-            else
-
+*/
-            PL_UNLOCK;
-        }
@@ -520 +524 @@
-
-/** Main loop for secondary preparser queue */
-
+secondary_
-{
-    playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
@@ -528 +532 @@
-    if( p_obj->i_waiting > 0 )
-    {
-
-
+
+
+
-        vlc_mutex_unlock( &p_obj->object_lock );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else

src/playlist/playlist_internal.h

@@ -40 +40 @@
-};
-
+typedef struct preparse_item_t
+{
+    input_item_t *p_item;
+    vlc_bool_t   b_fetch_art;
+} preparse_item_t;
+
+struct playlist_secondary_preparse_t
+{
+    VLC_COMMON_MEMBERS
+    vlc_mutex_t     lock;
+    int             i_waiting;
+    preparse_item_t *p_waiting;
+};
-
-/*****************************************************************************
@@ -53 +66 @@
-void playlist_LastLoop( playlist_t * );
-void playlist_PreparseLoop( playlist_preparse_t * );
-
+secondary_
-
-/* Control */

src/playlist/thread.c

@@ -34 +34 @@
-static void RunControlThread ( playlist_t * );
-static void RunPreparse( playlist_preparse_t * );
-
+secondary_
-
-static playlist_t * CreatePlaylist( vlc_object_t *p_parent );
@@ -97 +97 @@
-    // Secondary Preparse
-    p_playlist->p_secondary_preparse = vlc_object_create( p_playlist,
-    sizeof( playlist
+sizeof( playlist_secondary
-    if( !p_playlist->p_secondary_preparse )
-    {
@@ -105 +105 @@
-    }
-    p_playlist->p_secondary_preparse->i_waiting = 0;
-p
+
-
-    vlc_object_attach( p_playlist->p_secondary_preparse, p_playlist );
@@ -219 +219 @@
-}
-
-
+secondary_
-{
-    playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;