videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

rename art_finder as meta_fetcher

This commit is contained in:
Francois Cartegnie 2014-05-13 16:36:31 +02:00
parent 058b871eb0
commit ba13ac0ca1
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/vlc_art_finder.h → include/vlc_meta_fetcher.h
View File

@ -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

3
m4/intl.m4
View File

@ -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

6
modules/lua/meta.c
View File

@ -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 };

6
modules/lua/vlc.h
View File

@ -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 * );

4
modules/meta_engine/folder.c
View File

@ -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;

2
src/Makefile.am
View File

@ -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 \

6
src/playlist/fetcher.c
View File

@ -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;