Use var_InheritString for --decklink-video-connection.

[vlc] / modules / meta_engine / folder.c

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index b7b68811bc9837936a493fb8e8a48ca9046ffa6c..99c640ce0a3efd52d6f2fafdb3231e6ea9c0f704 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -24,13 +24,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#define _GNU_SOURCE
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc_meta.h>
-#include <charset.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_art_finder.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
+#include <vlc_input_item.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
@@ -40,6 +44,15 @@
 #   define MAX_PATH 250
 #endif
 
+static const char* cover_files[] = {
+    "Folder.jpg",           /* Windows */
+    "AlbumArtSmall.jpg",    /* Windows */
+    ".folder.png",          /* KDE?    */
+    "cover.jpg",            /* rockbox */
+};
+
+static const int i_covers = (sizeof(cover_files)/sizeof(cover_files[0]));
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -49,85 +62,70 @@ static int FindMeta( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 
-vlc_module_begin();
-/*    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );*/
-    set_shortname( N_( "Folder" ) );
-    set_description( _("Folder meta data") );
-
-    set_capability( "art finder", 10 );
-    set_callbacks( FindMeta, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( N_( "Folder" ) )
+    set_description( N_("Folder meta data") )
+    add_file( "album-art-filename", NULL, NULL,
+        N_("Album art filename"), N_("Filename to look for album art in current directory"), false );
+    set_capability( "art finder", 90 )
+    set_callbacks( FindMeta, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  *****************************************************************************/
 static int FindMeta( vlc_object_t *p_this )
 {
-    meta_engine_t *p_me = (meta_engine_t *)p_this;
-    input_item_t *p_item = p_me->p_item;
-    vlc_bool_t b_have_art = VLC_FALSE;
-    uint32_t i_meta;
+    art_finder_t *p_finder = (art_finder_t *)p_this;
+    input_item_t *p_item = p_finder->p_item;
+    bool b_have_art = false;
 
-    if( !p_item->p_meta ) return VLC_EGENERIC;
+    int i;
+    struct stat a;
+    char psz_filename[MAX_PATH];
 
+    if( !p_item )
+        return VLC_EGENERIC;
 
-    if( p_me->i_mandatory & VLC_META_ENGINE_ART_URL
-        || p_me->i_optional & VLC_META_ENGINE_ART_URL )
-    {
-        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, '/' );
+    char *psz_dir = input_item_GetURI( p_item );
+    if( !psz_dir )
+        return VLC_EGENERIC;
 
-        if( psz_buf )
+    char *psz_path = make_path( psz_dir );
+    free( psz_dir );
+    if( psz_path == NULL )
+        return VLC_EGENERIC;
+
+    char *psz_buf = strrchr( psz_path, DIR_SEP_CHAR );
+    if( psz_buf )
+        *++psz_buf = '\0';
+    else
+        *psz_path = '\0'; /* relative path */
+
+    for( i = -1; !b_have_art && i < i_covers; i++ )
+    {
+        if( i == -1 ) /* higher priority : configured filename */
         {
-            psz_buf++;
-            *psz_buf = '\0';
+            char *psz_userfile = var_InheritString( p_this, "album-art-filename" );
+            if( !psz_userfile )
+                continue;
+            snprintf( psz_filename, MAX_PATH, "%s%s", psz_path, psz_userfile );
+            free( psz_userfile );
         }
         else
-        {
-            *psz_dir = '\0';
-        }
+            snprintf( psz_filename, MAX_PATH, "%s%s", psz_path, cover_files[i] );
 
-        for( i = 0; b_have_art == VLC_FALSE && i < 3; i++ )
+        if( vlc_stat( psz_filename, &a ) != -1 )
         {
-            switch( i )
-            {
-                case 0:
-                /* Windows Folder.jpg */
-                snprintf( psz_filename, MAX_PATH,
-                          "file://%sFolder.jpg", psz_dir );
-                break;
-
-                case 1:
-                /* Windows AlbumArtSmall.jpg == small version of Folder.jpg */
-                snprintf( psz_filename, MAX_PATH,
-                      "file://%sAlbumArtSmall.jpg", psz_dir );
-                break;
-
-                case 2:
-                /* KDE (?) .folder.png */
-                snprintf( psz_filename, MAX_PATH,
-                      "file://%s.folder.png", psz_dir );
-                break;
-            }
-
-            if( utf8_stat( psz_filename+7, &a ) != -1 )
+            char *psz_uri = make_URI( psz_filename, "file" );
+            if( psz_uri )
             {
-                vlc_meta_SetArtURL( p_item->p_meta, psz_filename );
-                b_have_art = VLC_TRUE;
+                input_item_SetArtURL( p_item, psz_uri );
+                free( psz_uri );
+                b_have_art = true;
             }
         }
-
-        free( psz_dir );
     }
+    free( psz_path );
 
-    i_meta = input_CurrentMetaFlags( p_item->p_meta );
-    p_me->i_mandatory &= ~i_meta;
-    p_me->i_optional &= ~i_meta;
-    if( p_me->i_mandatory )
-        return VLC_EGENERIC;
-    else
-        return VLC_SUCCESS;
+    return b_have_art ? VLC_SUCCESS : VLC_EGENERIC;
 }