int (*__net_Accept_inner) (vlc_object_t *, int *, mtime_t);
int (*__net_OpenUDP_inner) (vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server);
void (*net_Close_inner) (int fd);
- int (*__net_Read_inner) (vlc_object_t *p_this, int fd, v_socket_t *, uint8_t *p_data, int i_data, vlc_bool_t b_retry);
- int (*__net_ReadNonBlock_inner) (vlc_object_t *p_this, int fd, v_socket_t *, uint8_t *p_data, int i_data, mtime_t i_wait);
- int (*__net_Select_inner) (vlc_object_t *p_this, int *pi_fd, v_socket_t **, int i_fd, uint8_t *p_data, int i_data, mtime_t i_wait);
- int (*__net_Write_inner) (vlc_object_t *p_this, int fd, v_socket_t *, const uint8_t *p_data, int i_data);
- char * (*__net_Gets_inner) (vlc_object_t *p_this, int fd, v_socket_t *);
- int (*net_Printf_inner) (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, ...);
- int (*__net_vaPrintf_inner) (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, va_list args);
+ int (*__net_Read_inner) (vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, int i_data, vlc_bool_t b_retry);
+ int (*__net_ReadNonBlock_inner) (vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, int i_data, mtime_t i_wait);
+ int (*__net_Select_inner) (vlc_object_t *p_this, const int *pi_fd, const v_socket_t *const *, int i_fd, uint8_t *p_data, int i_data, mtime_t i_wait);
+ int (*__net_Write_inner) (vlc_object_t *p_this, int fd, const v_socket_t *, const uint8_t *p_data, int i_data);
+ char * (*__net_Gets_inner) (vlc_object_t *p_this, int fd, const v_socket_t *);
+ int (*net_Printf_inner) (vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ...);
+ int (*__net_vaPrintf_inner) (vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args);
int (*vout_ShowTextRelative_inner) (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t);
int (*vout_ShowTextAbsolute_inner) (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
void (*__vout_OSDMessage_inner) (vlc_object_t *, int, char *, ...);
void (*tls_ClientDelete_inner) (tls_session_t *);
image_handler_t * (*__image_HandlerCreate_inner) (vlc_object_t *);
void (*image_HandlerDelete_inner) (image_handler_t *);
- char * (*vlc_input_item_GetInfo_inner) (input_item_t *p_i, const char *psz_cat,const char *psz_name);
- int (*vlc_input_item_AddInfo_inner) (input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ...);
+ void *vlc_input_item_GetInfo_deprecated;
+ void *vlc_input_item_AddInfo_deprecated;
input_thread_t * (*__input_CreateThread_inner) (vlc_object_t *, input_item_t *);
int (*__input_Preparse_inner) (vlc_object_t *, input_item_t *);
void (*input_StopThread_inner) (input_thread_t *);
subpicture_region_t * (*__spu_CreateRegion_inner) (vlc_object_t *, video_format_t *);
subpicture_region_t * (*__spu_MakeRegion_inner) (vlc_object_t *, video_format_t *, picture_t *);
void (*__spu_DestroyRegion_inner) (vlc_object_t *, subpicture_region_t *);
- subpicture_t * (*spu_SortSubpictures_inner) (spu_t *, mtime_t);
+ subpicture_t * (*spu_SortSubpictures_inner) (spu_t *, mtime_t, vlc_bool_t);
void (*spu_RenderSubpictures_inner) (spu_t *, video_format_t *, picture_t *, picture_t *, subpicture_t *, int, int);
char * (*stream_ReadLine_inner) (stream_t *);
stream_t * (*__stream_DemuxNew_inner) (vlc_object_t *p_obj, char *psz_demux, es_out_t *out);
void *__stats_CounterGet_deprecated;
input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
void *stats_HandlerDestroy_deprecated;
- vlc_t * (*vlc_current_object_inner) (int);
+ libvlc_int_t * (*vlc_current_object_inner) (int);
void (*__var_OptionParse_inner) (vlc_object_t *, const char *);
void *__stats_TimerDumpAll_deprecated;
void (*__stats_TimerDump_inner) (vlc_object_t*, unsigned int);
unsigned int (*update_iterator_ChooseMirrorAndFile_inner) (update_iterator_t *, int, int, int);
update_t * (*__update_New_inner) (vlc_object_t *);
void (*update_download_inner) (update_iterator_t *, char *);
- void (*vlc_HashInsert_inner) (hashtable_entry_t **, int *, int, const char *, void *);
- int (*vlc_HashLookup_inner) (hashtable_entry_t *, int, int, const char *);
- void* (*vlc_HashRetrieve_inner) (hashtable_entry_t*, int, int, const char *);
+ void *vlc_HashInsert_deprecated;
+ void *vlc_HashLookup_deprecated;
+ void *vlc_HashRetrieve_deprecated;
void * (*utf8_opendir_inner) (const char *dirname);
FILE * (*utf8_fopen_inner) (const char *filename, const char *mode);
const char * (*utf8_readdir_inner) (void *dir);
playlist_item_t * (*__playlist_ItemNewFromInput_inner) (vlc_object_t *p_obj,input_item_t *p_input);
input_item_t * (*input_ItemGetById_inner) (playlist_t *, int);
int (*playlist_LiveSearchUpdate_inner) (playlist_t *, playlist_item_t *, const char *);
- void (*vlc_input_item_AddOption_inner) (input_item_t *p_input, const char *psz_option);
+ void *vlc_input_item_AddOption_deprecated;
int (*playlist_DeleteFromInput_inner) (playlist_t *, int, playlist_item_t *, vlc_bool_t);
int (*playlist_DeleteAllFromInput_inner) (playlist_t *, int);
int (*playlist_LockDeleteAllFromInput_inner) (playlist_t *, int);
void (*playlist_NodeDump_inner) (playlist_t *p_playlist, playlist_item_t *p_item, int i_level);
void *__intf_UserOkayCancel_deprecated;
int (*__intf_UserStringInput_inner) (vlc_object_t*, const char*, const char*, char **);
- void (*playlist_NodesCreateForSD_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **);
+ void *playlist_NodesCreateForSD_deprecated;
vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
counter_t * (*__stats_CounterCreate_inner) (vlc_object_t*, int, int);
void *stats_TimerClean_deprecated;
int (*__intf_Progress_inner) (vlc_object_t*, const char*, const char*, float, int);
void (*__intf_ProgressUpdate_inner) (vlc_object_t*, int, const char*, float, int);
int (*playlist_AddInput_inner) (playlist_t *, input_item_t *,int , int, vlc_bool_t);
+ void (*vlc_DictInsert_inner) (dict_t *, int, const char *, void *);
+ void* (*vlc_DictGet_inner) (dict_t *, int, const char *);
+ int (*vlc_DictLookup_inner) (dict_t *, int, const char *);
+ void (*vlc_DictClear_inner) (dict_t *);
+ dict_t * (*vlc_DictNew_inner) (void);
+ playlist_item_t * (*playlist_GetPreferredNode_inner) (playlist_t *p_playlist, playlist_item_t *p_node);
+ int (*utf8_fprintf_inner) (FILE *, const char *, ...);
+ int (*utf8_vfprintf_inner) (FILE *stream, const char *fmt, va_list ap);
+ int (*net_SetDSCP_inner) (int fd, uint8_t dscp);
+ void (*vout_EnableFilter_inner) (vout_thread_t *, char *,vlc_bool_t , vlc_bool_t);
+ void (*aout_EnableFilter_inner) (vlc_object_t *, const char *, vlc_bool_t);
+ void (*playlist_NodesPairCreate_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **, vlc_bool_t);
+ char * (*aout_VisualChange_inner) (vlc_object_t *, int);
+ void *__input_SecondaryPreparse_deprecated;
+ void (*input_ItemAddOption_inner) (input_item_t *, const char *);
+ char * (*input_ItemGetInfo_inner) (input_item_t *p_i, const char *psz_cat,const char *psz_name);
+ int (*input_ItemAddInfo_inner) (input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ...);
+ void (*input_ItemAddOptionNoDup_inner) (input_item_t *, const char *);
+ void *__input_MetaFetch_deprecated;
+ void *input_DownloadAndCacheArt_deprecated;
+ void *input_GetMetaEngineFlags_deprecated;
+ void *__input_ArtFetch_deprecated;
+ void *input_AskForArt_deprecated;
+ int (*playlist_AskForArtEnqueue_inner) (playlist_t *, input_item_t *);
};
# if defined (__PLUGIN__)
# define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
# define tls_ClientDelete (p_symbols)->tls_ClientDelete_inner
# define __image_HandlerCreate (p_symbols)->__image_HandlerCreate_inner
# define image_HandlerDelete (p_symbols)->image_HandlerDelete_inner
-# define vlc_input_item_GetInfo (p_symbols)->vlc_input_item_GetInfo_inner
-# define vlc_input_item_AddInfo (p_symbols)->vlc_input_item_AddInfo_inner
# define __input_CreateThread (p_symbols)->__input_CreateThread_inner
# define __input_Preparse (p_symbols)->__input_Preparse_inner
# define input_StopThread (p_symbols)->input_StopThread_inner
# define update_iterator_ChooseMirrorAndFile (p_symbols)->update_iterator_ChooseMirrorAndFile_inner
# define __update_New (p_symbols)->__update_New_inner
# define update_download (p_symbols)->update_download_inner
-# define vlc_HashInsert (p_symbols)->vlc_HashInsert_inner
-# define vlc_HashLookup (p_symbols)->vlc_HashLookup_inner
-# define vlc_HashRetrieve (p_symbols)->vlc_HashRetrieve_inner
# define utf8_opendir (p_symbols)->utf8_opendir_inner
# define utf8_fopen (p_symbols)->utf8_fopen_inner
# define utf8_readdir (p_symbols)->utf8_readdir_inner
# define __playlist_ItemNewFromInput (p_symbols)->__playlist_ItemNewFromInput_inner
# define input_ItemGetById (p_symbols)->input_ItemGetById_inner
# define playlist_LiveSearchUpdate (p_symbols)->playlist_LiveSearchUpdate_inner
-# define vlc_input_item_AddOption (p_symbols)->vlc_input_item_AddOption_inner
# define playlist_DeleteFromInput (p_symbols)->playlist_DeleteFromInput_inner
# define playlist_DeleteAllFromInput (p_symbols)->playlist_DeleteAllFromInput_inner
# define playlist_LockDeleteAllFromInput (p_symbols)->playlist_LockDeleteAllFromInput_inner
# define playlist_DeleteFromItemId (p_symbols)->playlist_DeleteFromItemId_inner
# define playlist_NodeDump (p_symbols)->playlist_NodeDump_inner
# define __intf_UserStringInput (p_symbols)->__intf_UserStringInput_inner
-# define playlist_NodesCreateForSD (p_symbols)->playlist_NodesCreateForSD_inner
# define input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
# define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
# define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
# define __intf_Progress (p_symbols)->__intf_Progress_inner
# define __intf_ProgressUpdate (p_symbols)->__intf_ProgressUpdate_inner
# define playlist_AddInput (p_symbols)->playlist_AddInput_inner
+# define vlc_DictInsert (p_symbols)->vlc_DictInsert_inner
+# define vlc_DictGet (p_symbols)->vlc_DictGet_inner
+# define vlc_DictLookup (p_symbols)->vlc_DictLookup_inner
+# define vlc_DictClear (p_symbols)->vlc_DictClear_inner
+# define vlc_DictNew (p_symbols)->vlc_DictNew_inner
+# define playlist_GetPreferredNode (p_symbols)->playlist_GetPreferredNode_inner
+# define utf8_fprintf (p_symbols)->utf8_fprintf_inner
+# define utf8_vfprintf (p_symbols)->utf8_vfprintf_inner
+# define net_SetDSCP (p_symbols)->net_SetDSCP_inner
+# define vout_EnableFilter (p_symbols)->vout_EnableFilter_inner
+# define aout_EnableFilter (p_symbols)->aout_EnableFilter_inner
+# define playlist_NodesPairCreate (p_symbols)->playlist_NodesPairCreate_inner
+# define aout_VisualChange (p_symbols)->aout_VisualChange_inner
+# define input_ItemAddOption (p_symbols)->input_ItemAddOption_inner
+# define input_ItemGetInfo (p_symbols)->input_ItemGetInfo_inner
+# define input_ItemAddInfo (p_symbols)->input_ItemAddInfo_inner
+# define input_ItemAddOptionNoDup (p_symbols)->input_ItemAddOptionNoDup_inner
+# define playlist_AskForArtEnqueue (p_symbols)->playlist_AskForArtEnqueue_inner
# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
/******************************************************************
* STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
((p_symbols)->tls_ClientDelete_inner) = tls_ClientDelete; \
((p_symbols)->__image_HandlerCreate_inner) = __image_HandlerCreate; \
((p_symbols)->image_HandlerDelete_inner) = image_HandlerDelete; \
- ((p_symbols)->vlc_input_item_GetInfo_inner) = vlc_input_item_GetInfo; \
- ((p_symbols)->vlc_input_item_AddInfo_inner) = vlc_input_item_AddInfo; \
((p_symbols)->__input_CreateThread_inner) = __input_CreateThread; \
((p_symbols)->__input_Preparse_inner) = __input_Preparse; \
((p_symbols)->input_StopThread_inner) = input_StopThread; \
((p_symbols)->update_iterator_ChooseMirrorAndFile_inner) = update_iterator_ChooseMirrorAndFile; \
((p_symbols)->__update_New_inner) = __update_New; \
((p_symbols)->update_download_inner) = update_download; \
- ((p_symbols)->vlc_HashInsert_inner) = vlc_HashInsert; \
- ((p_symbols)->vlc_HashLookup_inner) = vlc_HashLookup; \
- ((p_symbols)->vlc_HashRetrieve_inner) = vlc_HashRetrieve; \
((p_symbols)->utf8_opendir_inner) = utf8_opendir; \
((p_symbols)->utf8_fopen_inner) = utf8_fopen; \
((p_symbols)->utf8_readdir_inner) = utf8_readdir; \
((p_symbols)->__playlist_ItemNewFromInput_inner) = __playlist_ItemNewFromInput; \
((p_symbols)->input_ItemGetById_inner) = input_ItemGetById; \
((p_symbols)->playlist_LiveSearchUpdate_inner) = playlist_LiveSearchUpdate; \
- ((p_symbols)->vlc_input_item_AddOption_inner) = vlc_input_item_AddOption; \
((p_symbols)->playlist_DeleteFromInput_inner) = playlist_DeleteFromInput; \
((p_symbols)->playlist_DeleteAllFromInput_inner) = playlist_DeleteAllFromInput; \
((p_symbols)->playlist_LockDeleteAllFromInput_inner) = playlist_LockDeleteAllFromInput; \
((p_symbols)->playlist_DeleteFromItemId_inner) = playlist_DeleteFromItemId; \
((p_symbols)->playlist_NodeDump_inner) = playlist_NodeDump; \
((p_symbols)->__intf_UserStringInput_inner) = __intf_UserStringInput; \
- ((p_symbols)->playlist_NodesCreateForSD_inner) = playlist_NodesCreateForSD; \
((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
((p_symbols)->__intf_Progress_inner) = __intf_Progress; \
((p_symbols)->__intf_ProgressUpdate_inner) = __intf_ProgressUpdate; \
((p_symbols)->playlist_AddInput_inner) = playlist_AddInput; \
+ ((p_symbols)->vlc_DictInsert_inner) = vlc_DictInsert; \
+ ((p_symbols)->vlc_DictGet_inner) = vlc_DictGet; \
+ ((p_symbols)->vlc_DictLookup_inner) = vlc_DictLookup; \
+ ((p_symbols)->vlc_DictClear_inner) = vlc_DictClear; \
+ ((p_symbols)->vlc_DictNew_inner) = vlc_DictNew; \
+ ((p_symbols)->playlist_GetPreferredNode_inner) = playlist_GetPreferredNode; \
+ ((p_symbols)->utf8_fprintf_inner) = utf8_fprintf; \
+ ((p_symbols)->utf8_vfprintf_inner) = utf8_vfprintf; \
+ ((p_symbols)->net_SetDSCP_inner) = net_SetDSCP; \
+ ((p_symbols)->vout_EnableFilter_inner) = vout_EnableFilter; \
+ ((p_symbols)->aout_EnableFilter_inner) = aout_EnableFilter; \
+ ((p_symbols)->playlist_NodesPairCreate_inner) = playlist_NodesPairCreate; \
+ ((p_symbols)->aout_VisualChange_inner) = aout_VisualChange; \
+ ((p_symbols)->input_ItemAddOption_inner) = input_ItemAddOption; \
+ ((p_symbols)->input_ItemGetInfo_inner) = input_ItemGetInfo; \
+ ((p_symbols)->input_ItemAddInfo_inner) = input_ItemAddInfo; \
+ ((p_symbols)->input_ItemAddOptionNoDup_inner) = input_ItemAddOptionNoDup; \
+ ((p_symbols)->playlist_AskForArtEnqueue_inner) = playlist_AskForArtEnqueue; \
(p_symbols)->net_ConvertIPv4_deprecated = NULL; \
+ (p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
+ (p_symbols)->vlc_input_item_AddInfo_deprecated = NULL; \
(p_symbols)->__playlist_ItemNew_deprecated = NULL; \
(p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
(p_symbols)->playlist_ItemAddParent_deprecated = NULL; \
(p_symbols)->__stats_CounterGet_deprecated = NULL; \
(p_symbols)->stats_HandlerDestroy_deprecated = NULL; \
(p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \
+ (p_symbols)->vlc_HashInsert_deprecated = NULL; \
+ (p_symbols)->vlc_HashLookup_deprecated = NULL; \
+ (p_symbols)->vlc_HashRetrieve_deprecated = NULL; \
(p_symbols)->playlist_ItemNewFromInput_deprecated = NULL; \
(p_symbols)->playlist_PlaylistAdd_deprecated = NULL; \
(p_symbols)->playlist_PlaylistAddExt_deprecated = NULL; \
(p_symbols)->playlist_PlaylistAddInput_deprecated = NULL; \
+ (p_symbols)->vlc_input_item_AddOption_deprecated = NULL; \
(p_symbols)->__intf_UserOkayCancel_deprecated = NULL; \
+ (p_symbols)->playlist_NodesCreateForSD_deprecated = NULL; \
(p_symbols)->stats_TimerClean_deprecated = NULL; \
(p_symbols)->stats_TimersClean_deprecated = NULL; \
(p_symbols)->__intf_IntfProgressUpdate_deprecated = NULL; \
(p_symbols)->__intf_IntfProgress_deprecated = NULL; \
(p_symbols)->streaming_ChainToPsz_deprecated = NULL; \
+ (p_symbols)->__input_SecondaryPreparse_deprecated = NULL; \
+ (p_symbols)->__input_MetaFetch_deprecated = NULL; \
+ (p_symbols)->input_DownloadAndCacheArt_deprecated = NULL; \
+ (p_symbols)->input_GetMetaEngineFlags_deprecated = NULL; \
+ (p_symbols)->__input_ArtFetch_deprecated = NULL; \
+ (p_symbols)->input_AskForArt_deprecated = NULL; \
# endif /* __PLUGIN__ */
#endif /* __VLC_SYMBOLS_H */