Remove recursive libvlc <-> vlc/vlc inclusion

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index edbd83dc99ec9d4587edc9d27333779375b7b54d..fd872707948c6a90a67a0ac459c2b4c8803cc7a5 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -35,7 +35,7 @@
 #include <vlc_epg.h>
 #include <vlc_events.h>
 
-#include <string.h>                                     /* strcasestr() */
+#include <string.h>                                     /* strstr() */
 
 struct vlc_meta_t;
 
@@ -173,7 +173,7 @@ static inline bool input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta
         return false;
     }
     const char * meta = vlc_meta_Get( p_i->p_meta, meta_type );
-    bool ret = meta && strcasestr( meta, psz );
+    bool ret = meta && strstr( meta, psz );
     vlc_mutex_unlock( &p_i->lock );
 
     return ret;
@@ -258,12 +258,6 @@ static inline bool input_item_IsPreparsed( input_item_t *p_i )
     return p_i->p_meta ? p_i->p_meta->i_status & ITEM_PREPARSED : false ;
 }
 
-static inline bool input_item_IsMetaFetched( input_item_t *p_i )
-{
-    return p_i->p_meta ? p_i->p_meta->i_status & ITEM_META_FETCHED : false ;
-}
-
-
 static inline bool input_item_IsArtFetched( input_item_t *p_i )
 {
     return p_i->p_meta ? p_i->p_meta->i_status & ITEM_ART_FETCHED : false ;
@@ -323,7 +317,7 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p
 #define input_item_GetSetting( item )        input_item_GetMeta( item, vlc_meta_Setting )
 
 VLC_EXPORT( char *, input_ItemGetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
-VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) ATTRIBUTE_FORMAT( 4, 5 ) );
+VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) LIBVLC_FORMAT( 4, 5 ) );
 
 #define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
 #define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)