rename art_finder as meta_fetcher

diff --git a/include/vlc_art_finder.h b/include/vlc_meta_fetcher.h
similarity index 90%
rename from include/vlc_art_finder.h
rename to include/vlc_meta_fetcher.h
index 52941c9fc8a1d7cf4d99e21cc3ad9445c0366696..f1ce2294626075c14cc8083fea46fbe15775cd2c 100644 (file)
--- a/include/vlc_art_finder.h
+++ b/include/vlc_meta_fetcher.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * vlc_art_finder.h
+ * vlc_meta_fetcher.h
  *****************************************************************************
  * Copyright (C) 2009 Rémi Denis-Courmont
  *
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_ART_FINDER_H
-#define VLC_ART_FINDER_H 1
+#ifndef VLC_META_FETCHER_H
+#define VLC_META_FETCHER_H 1
 
 typedef enum meta_fetcher_scope_t
 {
@@ -28,11 +28,11 @@ typedef enum meta_fetcher_scope_t
     FETCHER_SCOPE_ANY
 } meta_fetcher_scope_t;
 
-typedef struct art_finder_t
+typedef struct meta_fetcher_t
 {
     VLC_COMMON_MEMBERS
     input_item_t *p_item;
     meta_fetcher_scope_t e_scope;
-} art_finder_t;
+} meta_fetcher_t;
 
 #endif

diff --git a/m4/intl.m4 b/m4/intl.m4
index dffcd881b8ac60dcd0cb633f54d061cd8a40f09c..67feb5862fc30cfa38bc3c1b1905dcb82e0214c4 100644 (file)
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 24 (gettext-0.18.3)
+# intl.m4 serial 25 (gettext-0.18.3)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -42,6 +42,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
   AC_REQUIRE([gt_INTL_MACOSX])dnl
+  AC_REQUIRE([gl_EXTERN_INLINE])dnl
 
   dnl Support for automake's --enable-silent-rules.
   case "$enable_silent_rules" in

diff --git a/modules/lua/meta.c b/modules/lua/meta.c
index f5bab82d3c6d31a6f00308c797d377c6eb5e3b27..80917a8609efcb8f5dacb61a71b277f0c80f7fcf 100644 (file)
--- a/modules/lua/meta.c
+++ b/modules/lua/meta.c
@@ -37,7 +37,7 @@
 #include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_demux.h>
-#include <vlc_art_finder.h>
+#include <vlc_meta_fetcher.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_stream.h>
@@ -259,7 +259,7 @@ int ReadMeta( demux_meta_t *p_this )
  * Read meta.
  *****************************************************************************/
 
-int FetchMeta( art_finder_t *p_finder )
+int FetchMeta( meta_fetcher_t *p_finder )
 {
     luabatch_context_t context = { p_finder->p_item, p_finder->e_scope, validate_scope };
 
@@ -271,7 +271,7 @@ int FetchMeta( art_finder_t *p_finder )
 /*****************************************************************************
  * Module entry point for art.
  *****************************************************************************/
-int FindArt( art_finder_t *p_finder )
+int FindArt( meta_fetcher_t *p_finder )
 {
     luabatch_context_t context = { p_finder->p_item, p_finder->e_scope, validate_scope };
 

diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index e5c29d99eea484e9fb42d8d0a5730666d5e88bc9..be8b0eee5d2d4f28a60b9028b9818995a9792039 100644 (file)
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -32,7 +32,7 @@
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>
-#include <vlc_art_finder.h>
+#include <vlc_meta_fetcher.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_stream.h>
@@ -52,8 +52,8 @@
  * Module entry points
  *****************************************************************************/
 int ReadMeta( demux_meta_t * );
-int FetchMeta( art_finder_t * );
-int FindArt( art_finder_t * );
+int FetchMeta( meta_fetcher_t * );
+int FindArt( meta_fetcher_t * );
 
 int Import_LuaPlaylist( vlc_object_t * );
 void Close_LuaPlaylist( vlc_object_t * );

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 2e463eb0d5908f7e8c9e6d457e21cd6920e45525..38c1e075f75b5fc96b065c7cd4c97381fe7b6ed8 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -33,7 +33,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_art_finder.h>
+#include <vlc_meta_fetcher.h>
 #include <vlc_fs.h>
 #include <vlc_url.h>
 #include <vlc_input_item.h>
@@ -72,7 +72,7 @@ vlc_module_end ()
  *****************************************************************************/
 static int FindMeta( vlc_object_t *p_this )
 {
-    art_finder_t *p_finder = (art_finder_t *)p_this;
+    meta_fetcher_t *p_finder = (meta_fetcher_t *)p_this;
     input_item_t *p_item = p_finder->p_item;
     bool b_have_art = false;
     struct stat statinfo;

diff --git a/src/Makefile.am b/src/Makefile.am
index 842fc732db21e6b61e391ee1cd9eeb14368b9b60..24af7c3f893716eb5a37ef6fedfe8a3b2b8ef71e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ pluginsinclude_HEADERS = \
        ../include/vlc_aout.h \
        ../include/vlc_aout_volume.h \
        ../include/vlc_arrays.h \
-       ../include/vlc_art_finder.h \
        ../include/vlc_atomic.h \
        ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
@@ -62,6 +61,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
+       ../include/vlc_meta_fetcher.h \
        ../include/vlc_media_library.h \
        ../include/vlc_mime.h \
        ../include/vlc_modules.h \

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index e91d5e44d617c2f1d68a59e4514eaa2a4060581a..41b6cf2892862e8326c9f1f660d12cb53cdb7c2e 100644 (file)
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -30,7 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
-#include <vlc_art_finder.h>
+#include <vlc_meta_fetcher.h>
 #include <vlc_memory.h>
 #include <vlc_demux.h>
 #include <vlc_modules.h>
@@ -225,7 +225,7 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item )
     i_ret = VLC_EGENERIC;
 
     vlc_object_t *p_parent = p_fetcher->object;
-    art_finder_t *p_finder =
+    meta_fetcher_t *p_finder =
         vlc_custom_create( p_parent, sizeof( *p_finder ), "art finder" );
     if( p_finder != NULL)
     {
@@ -341,7 +341,7 @@ error:
  */
 static void FetchMeta( playlist_fetcher_t *p_fetcher, input_item_t *p_item )
 {
-    art_finder_t *p_finder =
+    meta_fetcher_t *p_finder =
         vlc_custom_create( p_fetcher->object, sizeof( *p_finder ), "art finder" );
     if ( !p_finder )
         return;