[vlc-devel] [PATCH 3/4] rename art_finder as meta_fetcher
Francois Cartegnie
fcvlcdev at free.fr
Tue May 13 17:12:37 CEST 2014
---
include/vlc_art_finder.h | 38 --------------------------------------
include/vlc_meta_fetcher.h | 38 ++++++++++++++++++++++++++++++++++++++
m4/intl.m4 | 3 ++-
modules/lua/meta.c | 6 +++---
modules/lua/vlc.h | 6 +++---
modules/meta_engine/folder.c | 4 ++--
src/Makefile.am | 2 +-
src/playlist/fetcher.c | 6 +++---
8 files changed, 52 insertions(+), 51 deletions(-)
delete mode 100644 include/vlc_art_finder.h
create mode 100644 include/vlc_meta_fetcher.h
diff --git a/include/vlc_art_finder.h b/include/vlc_art_finder.h
deleted file mode 100644
index 52941c9..0000000
--- a/include/vlc_art_finder.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * vlc_art_finder.h
- *****************************************************************************
- * Copyright (C) 2009 Rémi Denis-Courmont
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef VLC_ART_FINDER_H
-#define VLC_ART_FINDER_H 1
-
-typedef enum meta_fetcher_scope_t
-{
- FETCHER_SCOPE_LOCAL,
- FETCHER_SCOPE_NETWORK,
- FETCHER_SCOPE_ANY
-} meta_fetcher_scope_t;
-
-typedef struct art_finder_t
-{
- VLC_COMMON_MEMBERS
- input_item_t *p_item;
- meta_fetcher_scope_t e_scope;
-} art_finder_t;
-
-#endif
diff --git a/include/vlc_meta_fetcher.h b/include/vlc_meta_fetcher.h
new file mode 100644
index 0000000..f1ce229
--- /dev/null
+++ b/include/vlc_meta_fetcher.h
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * vlc_meta_fetcher.h
+ *****************************************************************************
+ * Copyright (C) 2009 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_META_FETCHER_H
+#define VLC_META_FETCHER_H 1
+
+typedef enum meta_fetcher_scope_t
+{
+ FETCHER_SCOPE_LOCAL,
+ FETCHER_SCOPE_NETWORK,
+ FETCHER_SCOPE_ANY
+} meta_fetcher_scope_t;
+
+typedef struct meta_fetcher_t
+{
+ VLC_COMMON_MEMBERS
+ input_item_t *p_item;
+ meta_fetcher_scope_t e_scope;
+} meta_fetcher_t;
+
+#endif
diff --git a/m4/intl.m4 b/m4/intl.m4
index dffcd88..67feb58 100644
--- 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 0e4910c..c0cd916 100644
--- 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>
@@ -270,7 +270,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 };
@@ -282,7 +282,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 8ded87c..f395c1f 100644
--- 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 2e463eb..38c1e07 100644
--- 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 842fc73..24af7c3 100644
--- 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 e91d5e4..41b6cf2 100644
--- 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;
--
1.9.0
More information about the vlc-devel
mailing list