]> git.sesse.net Git - vlc/blobdiff - include/vlc_symbols.h
Const fixes
[vlc] / include / vlc_symbols.h
index 06f0b04a04c97c153c72f418d66531ad183e973f..8d0dd491e254e4b6259561e52b918777726deafb 100644 (file)
@@ -55,7 +55,7 @@ struct module_symbols_t
     int (*aout_Restart_inner) (aout_instance_t * p_aout);
     int (*aout_FindAndRestart_inner) (vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *);
     int (*aout_ChannelsRestart_inner) (vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *);
-    vlc_bool_t (*vlc_current_charset_inner) (char **);
+    void *vlc_current_charset_deprecated;
     int (*__config_GetType_inner) (vlc_object_t *, const char *);
     int (*__config_GetInt_inner) (vlc_object_t *, const char *);
     void (*__config_PutInt_inner) (vlc_object_t *, const char *, int);
@@ -70,9 +70,9 @@ struct module_symbols_t
     void (*__config_ResetAll_inner) (vlc_object_t *);
     module_config_t * (*config_FindConfig_inner) (vlc_object_t *, const char *);
     module_t * (*config_FindModule_inner) (vlc_object_t *, const char *);
-    void (*config_Duplicate_inner) (module_t *, module_config_t *);
-    void (*config_SetCallbacks_inner) (module_config_t *, module_config_t *);
-    void (*config_UnsetCallbacks_inner) (module_config_t *);
+    int (*config_Duplicate_inner) (module_t *, const module_config_t *, size_t);
+    void (*config_SetCallbacks_inner) (module_config_t *, module_config_t *, size_t);
+    void (*config_UnsetCallbacks_inner) (module_config_t *, size_t);
     int (*__intf_Eject_inner) (vlc_object_t *, const char *);
     const iso639_lang_t * (*GetLang_1_inner) (const char *);
     const iso639_lang_t * (*GetLang_2T_inner) (const char *);
@@ -159,8 +159,8 @@ struct module_symbols_t
     void * (*vout_RequestWindow_inner) (vout_thread_t *, int *, int *, unsigned int *, unsigned int *);
     void (*vout_ReleaseWindow_inner) (vout_thread_t *, void *);
     int (*vout_ControlWindow_inner) (vout_thread_t *, void *, int, va_list);
-    access_t * (*__access2_New_inner) (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, vlc_bool_t b_quick);
-    access_t * (*access2_FilterNew_inner) (access_t *p_source, char *psz_access_filter);
+    access_t * (*__access2_New_inner) (vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, vlc_bool_t b_quick);
+    access_t * (*access2_FilterNew_inner) (access_t *p_source, const char *psz_access_filter);
     void (*access2_Delete_inner) (access_t *);
     block_t * (*__block_New_inner) (vlc_object_t *, int);
     block_t * (*block_Realloc_inner) (block_t *, int i_pre, int i_body);
@@ -191,7 +191,7 @@ struct module_symbols_t
     size_t (*vlc_iconv_inner) (vlc_iconv_t, const char **, size_t *, char **, size_t *);
     int (*vlc_iconv_close_inner) (vlc_iconv_t);
     char * (*vlc_dgettext_inner) (const char *package, const char *msgid);
-    demux_t * (*__demux2_New_inner) (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t);
+    demux_t * (*__demux2_New_inner) (vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t);
     void (*demux2_Delete_inner) (demux_t *);
     int (*demux2_vaControlHelper_inner) (stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args);
     char const * (*vlc_error_inner) (int);
@@ -214,8 +214,8 @@ struct module_symbols_t
     int (*httpd_StreamHeader_inner) (httpd_stream_t *, uint8_t *p_data, int i_data);
     int (*httpd_StreamSend_inner) (httpd_stream_t *, uint8_t *p_data, int i_data);
     void (*httpd_MsgInit_inner) (httpd_message_t *);
-    void (*httpd_MsgAdd_inner) (httpd_message_t *, char *psz_name, char *psz_value, ...);
-    char * (*httpd_MsgGet_inner) (httpd_message_t *, char *psz_name);
+    void (*httpd_MsgAdd_inner) (httpd_message_t *, const char *psz_name, const char *psz_value, ...);
+    const char * (*httpd_MsgGet_inner) (httpd_message_t *, const char *psz_name);
     void (*httpd_MsgClean_inner) (httpd_message_t *);
     tls_server_t * (*tls_ServerCreate_inner) (vlc_object_t *, const char *, const char *);
     void (*tls_ServerDelete_inner) (tls_server_t *);
@@ -234,7 +234,7 @@ struct module_symbols_t
     decoder_t * (*input_DecoderNew_inner) (input_thread_t *, es_format_t *, vlc_bool_t b_force_decoder);
     void (*input_DecoderDelete_inner) (decoder_t *);
     void (*input_DecoderDecode_inner) (decoder_t *, block_t *);
-    intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, char **);
+    intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, const char *const *);
     int (*intf_RunThread_inner) (intf_thread_t *);
     void (*intf_StopThread_inner) (intf_thread_t *);
     void (*intf_Destroy_inner) (intf_thread_t *);
@@ -256,22 +256,22 @@ struct module_symbols_t
     void (*__vlc_object_release_inner) (vlc_object_t *);
     vlc_list_t * (*__vlc_list_find_inner) (vlc_object_t *, int, int);
     void (*vlc_list_release_inner) (vlc_list_t *);
-    int (*playlist_Control_inner) (playlist_t *, int, ...);
-    int (*playlist_LockControl_inner) (playlist_t *, int, ...);
-    void (*playlist_Clear_inner) (playlist_t *);
-    void (*playlist_LockClear_inner) (playlist_t *);
+    int (*playlist_Control_inner) (playlist_t *p_playlist, int i_query, vlc_bool_t b_locked, ...);
+    void *playlist_LockControl_deprecated;
+    void (*playlist_Clear_inner) (playlist_t *, vlc_bool_t);
+    void *playlist_LockClear_deprecated;
     int (*playlist_PreparseEnqueue_inner) (playlist_t *, input_item_t *);
     int (*playlist_ServicesDiscoveryAdd_inner) (playlist_t *, const char *);
     int (*playlist_ServicesDiscoveryRemove_inner) (playlist_t *, const char *);
-    int (*playlist_AddSDModules_inner) (playlist_t *, char *);
+    void *playlist_AddSDModules_deprecated;
     vlc_bool_t (*playlist_IsServicesDiscoveryLoaded_inner) (playlist_t *,const char *);
     void *__playlist_ItemNew_deprecated;
     void *__playlist_ItemCopy_deprecated;
-    playlist_item_t* (*playlist_ItemNewWithType_inner) (vlc_object_t *,const char *,const char *, int , const char **, int, int);
-    int (*playlist_ItemDelete_inner) (playlist_item_t *);
+    playlist_item_t* (*playlist_ItemNewWithType_inner) (vlc_object_t *,const char *,const char *, int , const char *const *, int, int);
+    void *playlist_ItemDelete_deprecated;
     void *playlist_ItemAddParent_deprecated;
     void *playlist_CopyParents_deprecated;
-    int (*playlist_ItemSetName_inner) (playlist_item_t *,  char *);
+    int (*playlist_ItemSetName_inner) (playlist_item_t *, const char *);
     void *playlist_ItemSetDuration_deprecated;
     void *playlist_ViewInsert_deprecated;
     void *playlist_ViewDelete_deprecated;
@@ -279,7 +279,7 @@ struct module_symbols_t
     void *playlist_ViewUpdate_deprecated;
     void *playlist_ViewDump_deprecated;
     void *playlist_ViewEmpty_deprecated;
-    playlist_item_t * (*playlist_NodeCreate_inner) (playlist_t *, char *, playlist_item_t * p_parent);
+    playlist_item_t * (*playlist_NodeCreate_inner) (playlist_t *, const char *, playlist_item_t * p_parent);
     int (*playlist_NodeAppend_inner) (playlist_t *,playlist_item_t*,playlist_item_t *);
     int (*playlist_NodeInsert_inner) (playlist_t *,playlist_item_t*,playlist_item_t *, int);
     int (*playlist_NodeRemoveItem_inner) (playlist_t *,playlist_item_t*,playlist_item_t *);
@@ -288,22 +288,22 @@ struct module_symbols_t
     int (*playlist_NodeDelete_inner) (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t);
     int (*playlist_NodeEmpty_inner) (playlist_t *, playlist_item_t *, vlc_bool_t);
     int (*playlist_Add_inner) (playlist_t *, const char *, const char *, int, int, vlc_bool_t);
-    int (*playlist_AddExt_inner) (playlist_t *, const char *, const char *, int, int, mtime_t, const char **,int, vlc_bool_t);
+    int (*playlist_AddExt_inner) (playlist_t *, const char *, const char *, int, int, mtime_t, const char *const *,int, vlc_bool_t);
     void *playlist_ItemAdd_deprecated;
-    void (*playlist_NodeAddItem_inner) (playlist_t *, playlist_item_t *, playlist_item_t *,int , int);
+    void *playlist_NodeAddItem_deprecated;
     void *playlist_Delete_deprecated;
-    int (*playlist_LockDelete_inner) (playlist_t *, int);
+    void *playlist_LockDelete_deprecated;
     void *playlist_Disable_deprecated;
     void *playlist_Enable_deprecated;
-    playlist_item_t* (*playlist_ItemToNode_inner) (playlist_t *,playlist_item_t *);
-    playlist_item_t* (*playlist_LockItemToNode_inner) (playlist_t *,playlist_item_t *);
+    playlist_item_t* (*playlist_ItemToNode_inner) (playlist_t *,playlist_item_t *, vlc_bool_t);
+    void *playlist_LockItemToNode_deprecated;
     void *playlist_Replace_deprecated;
     void *playlist_LockReplace_deprecated;
-    playlist_item_t * (*playlist_ItemGetById_inner) (playlist_t *, int);
+    playlist_item_t * (*playlist_ItemGetById_inner) (playlist_t *, int, vlc_bool_t);
     void *playlist_LockItemGetById_deprecated;
     void *playlist_ItemGetByPos_deprecated;
     void *playlist_LockItemGetByPos_deprecated;
-    playlist_item_t * (*playlist_ItemGetByInput_inner) (playlist_t *,input_item_t *);
+    playlist_item_t * (*playlist_ItemGetByInput_inner) (playlist_t *,input_item_t *, vlc_bool_t);
     void *playlist_LockItemGetByInput_deprecated;
     void *playlist_GetPositionById_deprecated;
     void *playlist_ItemAddOption_deprecated;
@@ -312,8 +312,8 @@ struct module_symbols_t
     void *playlist_NodeGroup_deprecated;
     int (*playlist_NodeSort_inner) (playlist_t *, playlist_item_t *,int, int);
     int (*playlist_RecursiveNodeSort_inner) (playlist_t *, playlist_item_t *,int, int);
-    int (*playlist_Import_inner) (playlist_t *, const char *, playlist_item_t *, vlc_bool_t);
-    int (*playlist_Export_inner) (playlist_t *, const char *, playlist_item_t *, const char *);
+    void *playlist_Import_deprecated;
+    int (*playlist_Export_inner) (playlist_t *p_playlist, const char *psz_name, playlist_item_t *p_export_root, const char *psz_type);
     spu_t * (*__spu_Create_inner) (vlc_object_t *);
     int (*spu_Init_inner) (spu_t *);
     void (*spu_Destroy_inner) (spu_t *);
@@ -326,7 +326,7 @@ struct module_symbols_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);
+    stream_t * (*__stream_DemuxNew_inner) (vlc_object_t *p_obj, const char *psz_demux, es_out_t *out);
     void (*stream_DemuxSend_inner) (stream_t *s, block_t *p_block);
     void (*stream_DemuxDelete_inner) (stream_t *s);
     stream_t * (*__stream_MemoryNew_inner) (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, vlc_bool_t i_preserve_memory);
@@ -390,7 +390,7 @@ struct module_symbols_t
     void (*LocaleFree_inner) (const char *);
     char * (*ToLocale_inner) (const char *);
     char * (*EnsureUTF8_inner) (char *);
-    char * (*__vlc_fix_readdir_charset_inner) (vlc_object_t *, const char *);
+    void *__vlc_fix_readdir_charset_deprecated;
     int (*vlc_scandir_inner) (const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ));
     int (*vlc_alphasort_inner) (const struct dirent **a, const struct dirent **b);
     osd_state_t * (*__osd_StateChange_inner) (osd_state_t *, const int);
@@ -426,7 +426,7 @@ struct module_symbols_t
     void (*osd_Message_inner) (spu_t *, int, char *, ...);
     int (*osd_ShowTextAbsolute_inner) (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
     char * (*config_GetUserDir_inner) (void);
-    char * (*FromUTF32_inner) (const uint32_t *);
+    void *FromUTF32_deprecated;
     int (*__input_Read_inner) (vlc_object_t *, input_item_t *, vlc_bool_t);
     int (*__net_ConnectUDP_inner) (vlc_object_t *p_this, const char *psz_host, int i_port, int hlim);
     void *__intf_Interact_deprecated;
@@ -466,11 +466,11 @@ struct module_symbols_t
     void *vlc_HashInsert_deprecated;
     void *vlc_HashLookup_deprecated;
     void *vlc_HashRetrieve_deprecated;
-    void * (*utf8_opendir_inner) (const char *dirname);
+    DIR * (*utf8_opendir_inner) (const char *dirname);
     FILE * (*utf8_fopen_inner) (const char *filename, const char *mode);
-    const char * (*utf8_readdir_inner) (void *dir);
-    int (*utf8_stat_inner) (const char *filename, void *buf);
-    int (*utf8_lstat_inner) (const char *filename, void *buf);
+    char * (*utf8_readdir_inner) (void *dir);
+    int (*utf8_stat_inner) (const char *filename, struct stat *buf);
+    int (*utf8_lstat_inner) (const char *filename, struct stat *buf);
     char * (*FromLocaleDup_inner) (const char *);
     int (*utf8_mkdir_inner) (const char *filename);
     vlm_media_t* (*vlm_MediaSearch_inner) (vlm_t *, const char *);
@@ -483,7 +483,7 @@ struct module_symbols_t
     char * (*convert_xml_special_chars_inner) (const char *psz_content);
     char * (*unescape_URI_duplicate_inner) (const char *psz);
     void (*resolve_xml_special_chars_inner) (char *psz_value);
-    char * (*FromUTF16_inner) (const uint16_t *);
+    void *FromUTF16_deprecated;
     const char * (*IsUTF8_inner) (const char *);
     const char * (*GetFallbackEncoding_inner) (void);
     int (*utf8_scandir_inner) (const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ));
@@ -492,22 +492,22 @@ struct module_symbols_t
     char * (*encode_URI_component_inner) (const char *psz);
     size_t (*vlc_strlcpy_inner) (char *, const char *, size_t);
     void *playlist_ItemNewFromInput_deprecated;
-    input_item_t * (*__input_ItemNewExt_inner) (vlc_object_t *, const char *, const char*, int, const char **, int);
-    input_item_t * (*input_ItemNewWithType_inner) (vlc_object_t *, const char *, const char *e, int, const char **, int, int);
+    input_item_t * (*__input_ItemNewExt_inner) (vlc_object_t *, const char *, const char*, int, const char *const *, int);
+    input_item_t * (*input_ItemNewWithType_inner) (vlc_object_t *, const char *, const char *e, int, const char *const *, int, int);
     playlist_item_t * (*playlist_NodeAddInput_inner) (playlist_t *, input_item_t *,playlist_item_t *,int , int);
     void *playlist_PlaylistAdd_deprecated;
     void *playlist_PlaylistAddExt_deprecated;
     void *playlist_PlaylistAddInput_deprecated;
-    int (*playlist_BothAddInput_inner) (playlist_t *, input_item_t *,playlist_item_t *,int , int);
+    int (*playlist_BothAddInput_inner) (playlist_t *, input_item_t *,playlist_item_t *,int , int, int*, int*);
     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_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_AddWhereverNeeded_inner) (playlist_t* , input_item_t*, playlist_item_t*,playlist_item_t*,vlc_bool_t, int);
-    int (*playlist_DeleteFromItemId_inner) (playlist_t *, int);
+    int (*playlist_DeleteFromInput_inner) (playlist_t *, int, vlc_bool_t);
+    void *playlist_DeleteAllFromInput_deprecated;
+    void *playlist_LockDeleteAllFromInput_deprecated;
+    void *playlist_AddWhereverNeeded_deprecated;
+    void *playlist_DeleteFromItemId_deprecated;
     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 **);
@@ -519,7 +519,7 @@ struct module_symbols_t
     void (*__stats_TimersClean_inner) (vlc_object_t *);
     void *__intf_IntfProgressUpdate_deprecated;
     void *__intf_IntfProgress_deprecated;
-    void *streaming_ChainToPsz_deprecated;
+    char* (*streaming_ChainToPsz_inner) (sout_chain_t*);
     int (*__intf_UserWarn_inner) (vlc_object_t*, const char*, const char*, ...);
     vlc_bool_t (*__intf_UserProgressIsCancelled_inner) (vlc_object_t*, int);
     int (*__intf_Progress_inner) (vlc_object_t*, const char*, const char*, float, int);
@@ -536,7 +536,7 @@ struct module_symbols_t
     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);
+    void (*playlist_NodesPairCreate_inner) (playlist_t *, const 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 *);
@@ -550,9 +550,15 @@ struct module_symbols_t
     void *input_AskForArt_deprecated;
     int (*playlist_AskForArtEnqueue_inner) (playlist_t *, input_item_t *);
     uint32_t (*input_CurrentMetaFlags_inner) (vlc_meta_t *p_meta);
-    void (*__config_ChainParse_inner) (vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t *);
+    void (*__config_ChainParse_inner) (vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t *);
     void (*config_ChainDestroy_inner) (config_chain_t *);
-    char * (*config_ChainCreate_inner) (char **, config_chain_t **, char *);
+    char * (*config_ChainCreate_inner) (char **, config_chain_t **, const char *);
+    int (*utf8_open_inner) (const char *filename, int flags, mode_t mode);
+    int (*net_ListenSingle_inner) (vlc_object_t *p_this, const char *psz_host, int i_port, int family, int socktype, int protocol);
+    char * (*str_format_time_inner) (char *);
+    char * (*__str_format_meta_inner) (vlc_object_t *, char *);
+    int (*vout_Snapshot_inner) (vout_thread_t *p_vout, picture_t *p_pic);
+    void (*streaming_GuiDescToChain_inner) (vlc_object_t*, sout_chain_t*, sout_gui_descr_t*);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -591,7 +597,6 @@ struct module_symbols_t
 #  define aout_Restart (p_symbols)->aout_Restart_inner
 #  define aout_FindAndRestart (p_symbols)->aout_FindAndRestart_inner
 #  define aout_ChannelsRestart (p_symbols)->aout_ChannelsRestart_inner
-#  define vlc_current_charset (p_symbols)->vlc_current_charset_inner
 #  define __config_GetType (p_symbols)->__config_GetType_inner
 #  define __config_GetInt (p_symbols)->__config_GetInt_inner
 #  define __config_PutInt (p_symbols)->__config_PutInt_inner
@@ -788,16 +793,12 @@ struct module_symbols_t
 #  define __vlc_list_find (p_symbols)->__vlc_list_find_inner
 #  define vlc_list_release (p_symbols)->vlc_list_release_inner
 #  define playlist_Control (p_symbols)->playlist_Control_inner
-#  define playlist_LockControl (p_symbols)->playlist_LockControl_inner
 #  define playlist_Clear (p_symbols)->playlist_Clear_inner
-#  define playlist_LockClear (p_symbols)->playlist_LockClear_inner
 #  define playlist_PreparseEnqueue (p_symbols)->playlist_PreparseEnqueue_inner
 #  define playlist_ServicesDiscoveryAdd (p_symbols)->playlist_ServicesDiscoveryAdd_inner
 #  define playlist_ServicesDiscoveryRemove (p_symbols)->playlist_ServicesDiscoveryRemove_inner
-#  define playlist_AddSDModules (p_symbols)->playlist_AddSDModules_inner
 #  define playlist_IsServicesDiscoveryLoaded (p_symbols)->playlist_IsServicesDiscoveryLoaded_inner
 #  define playlist_ItemNewWithType (p_symbols)->playlist_ItemNewWithType_inner
-#  define playlist_ItemDelete (p_symbols)->playlist_ItemDelete_inner
 #  define playlist_ItemSetName (p_symbols)->playlist_ItemSetName_inner
 #  define playlist_NodeCreate (p_symbols)->playlist_NodeCreate_inner
 #  define playlist_NodeAppend (p_symbols)->playlist_NodeAppend_inner
@@ -809,15 +810,11 @@ struct module_symbols_t
 #  define playlist_NodeEmpty (p_symbols)->playlist_NodeEmpty_inner
 #  define playlist_Add (p_symbols)->playlist_Add_inner
 #  define playlist_AddExt (p_symbols)->playlist_AddExt_inner
-#  define playlist_NodeAddItem (p_symbols)->playlist_NodeAddItem_inner
-#  define playlist_LockDelete (p_symbols)->playlist_LockDelete_inner
 #  define playlist_ItemToNode (p_symbols)->playlist_ItemToNode_inner
-#  define playlist_LockItemToNode (p_symbols)->playlist_LockItemToNode_inner
 #  define playlist_ItemGetById (p_symbols)->playlist_ItemGetById_inner
 #  define playlist_ItemGetByInput (p_symbols)->playlist_ItemGetByInput_inner
 #  define playlist_NodeSort (p_symbols)->playlist_NodeSort_inner
 #  define playlist_RecursiveNodeSort (p_symbols)->playlist_RecursiveNodeSort_inner
-#  define playlist_Import (p_symbols)->playlist_Import_inner
 #  define playlist_Export (p_symbols)->playlist_Export_inner
 #  define __spu_Create (p_symbols)->__spu_Create_inner
 #  define spu_Init (p_symbols)->spu_Init_inner
@@ -894,7 +891,6 @@ struct module_symbols_t
 #  define LocaleFree (p_symbols)->LocaleFree_inner
 #  define ToLocale (p_symbols)->ToLocale_inner
 #  define EnsureUTF8 (p_symbols)->EnsureUTF8_inner
-#  define __vlc_fix_readdir_charset (p_symbols)->__vlc_fix_readdir_charset_inner
 #  define vlc_scandir (p_symbols)->vlc_scandir_inner
 #  define vlc_alphasort (p_symbols)->vlc_alphasort_inner
 #  define __osd_StateChange (p_symbols)->__osd_StateChange_inner
@@ -930,7 +926,6 @@ struct module_symbols_t
 #  define osd_Message (p_symbols)->osd_Message_inner
 #  define osd_ShowTextAbsolute (p_symbols)->osd_ShowTextAbsolute_inner
 #  define config_GetUserDir (p_symbols)->config_GetUserDir_inner
-#  define FromUTF32 (p_symbols)->FromUTF32_inner
 #  define __input_Read (p_symbols)->__input_Read_inner
 #  define __net_ConnectUDP (p_symbols)->__net_ConnectUDP_inner
 #  define intf_InteractionManage (p_symbols)->intf_InteractionManage_inner
@@ -977,7 +972,6 @@ struct module_symbols_t
 #  define convert_xml_special_chars (p_symbols)->convert_xml_special_chars_inner
 #  define unescape_URI_duplicate (p_symbols)->unescape_URI_duplicate_inner
 #  define resolve_xml_special_chars (p_symbols)->resolve_xml_special_chars_inner
-#  define FromUTF16 (p_symbols)->FromUTF16_inner
 #  define IsUTF8 (p_symbols)->IsUTF8_inner
 #  define GetFallbackEncoding (p_symbols)->GetFallbackEncoding_inner
 #  define utf8_scandir (p_symbols)->utf8_scandir_inner
@@ -993,15 +987,12 @@ struct module_symbols_t
 #  define input_ItemGetById (p_symbols)->input_ItemGetById_inner
 #  define playlist_LiveSearchUpdate (p_symbols)->playlist_LiveSearchUpdate_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_AddWhereverNeeded (p_symbols)->playlist_AddWhereverNeeded_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 input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
 #  define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
 #  define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
+#  define streaming_ChainToPsz (p_symbols)->streaming_ChainToPsz_inner
 #  define __intf_UserWarn (p_symbols)->__intf_UserWarn_inner
 #  define __intf_UserProgressIsCancelled (p_symbols)->__intf_UserProgressIsCancelled_inner
 #  define __intf_Progress (p_symbols)->__intf_Progress_inner
@@ -1029,6 +1020,12 @@ struct module_symbols_t
 #  define __config_ChainParse (p_symbols)->__config_ChainParse_inner
 #  define config_ChainDestroy (p_symbols)->config_ChainDestroy_inner
 #  define config_ChainCreate (p_symbols)->config_ChainCreate_inner
+#  define utf8_open (p_symbols)->utf8_open_inner
+#  define net_ListenSingle (p_symbols)->net_ListenSingle_inner
+#  define str_format_time (p_symbols)->str_format_time_inner
+#  define __str_format_meta (p_symbols)->__str_format_meta_inner
+#  define vout_Snapshot (p_symbols)->vout_Snapshot_inner
+#  define streaming_GuiDescToChain (p_symbols)->streaming_GuiDescToChain_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1070,7 +1067,6 @@ struct module_symbols_t
     ((p_symbols)->aout_Restart_inner) = aout_Restart; \
     ((p_symbols)->aout_FindAndRestart_inner) = aout_FindAndRestart; \
     ((p_symbols)->aout_ChannelsRestart_inner) = aout_ChannelsRestart; \
-    ((p_symbols)->vlc_current_charset_inner) = vlc_current_charset; \
     ((p_symbols)->__config_GetType_inner) = __config_GetType; \
     ((p_symbols)->__config_GetInt_inner) = __config_GetInt; \
     ((p_symbols)->__config_PutInt_inner) = __config_PutInt; \
@@ -1267,16 +1263,12 @@ struct module_symbols_t
     ((p_symbols)->__vlc_list_find_inner) = __vlc_list_find; \
     ((p_symbols)->vlc_list_release_inner) = vlc_list_release; \
     ((p_symbols)->playlist_Control_inner) = playlist_Control; \
-    ((p_symbols)->playlist_LockControl_inner) = playlist_LockControl; \
     ((p_symbols)->playlist_Clear_inner) = playlist_Clear; \
-    ((p_symbols)->playlist_LockClear_inner) = playlist_LockClear; \
     ((p_symbols)->playlist_PreparseEnqueue_inner) = playlist_PreparseEnqueue; \
     ((p_symbols)->playlist_ServicesDiscoveryAdd_inner) = playlist_ServicesDiscoveryAdd; \
     ((p_symbols)->playlist_ServicesDiscoveryRemove_inner) = playlist_ServicesDiscoveryRemove; \
-    ((p_symbols)->playlist_AddSDModules_inner) = playlist_AddSDModules; \
     ((p_symbols)->playlist_IsServicesDiscoveryLoaded_inner) = playlist_IsServicesDiscoveryLoaded; \
     ((p_symbols)->playlist_ItemNewWithType_inner) = playlist_ItemNewWithType; \
-    ((p_symbols)->playlist_ItemDelete_inner) = playlist_ItemDelete; \
     ((p_symbols)->playlist_ItemSetName_inner) = playlist_ItemSetName; \
     ((p_symbols)->playlist_NodeCreate_inner) = playlist_NodeCreate; \
     ((p_symbols)->playlist_NodeAppend_inner) = playlist_NodeAppend; \
@@ -1288,15 +1280,11 @@ struct module_symbols_t
     ((p_symbols)->playlist_NodeEmpty_inner) = playlist_NodeEmpty; \
     ((p_symbols)->playlist_Add_inner) = playlist_Add; \
     ((p_symbols)->playlist_AddExt_inner) = playlist_AddExt; \
-    ((p_symbols)->playlist_NodeAddItem_inner) = playlist_NodeAddItem; \
-    ((p_symbols)->playlist_LockDelete_inner) = playlist_LockDelete; \
     ((p_symbols)->playlist_ItemToNode_inner) = playlist_ItemToNode; \
-    ((p_symbols)->playlist_LockItemToNode_inner) = playlist_LockItemToNode; \
     ((p_symbols)->playlist_ItemGetById_inner) = playlist_ItemGetById; \
     ((p_symbols)->playlist_ItemGetByInput_inner) = playlist_ItemGetByInput; \
     ((p_symbols)->playlist_NodeSort_inner) = playlist_NodeSort; \
     ((p_symbols)->playlist_RecursiveNodeSort_inner) = playlist_RecursiveNodeSort; \
-    ((p_symbols)->playlist_Import_inner) = playlist_Import; \
     ((p_symbols)->playlist_Export_inner) = playlist_Export; \
     ((p_symbols)->__spu_Create_inner) = __spu_Create; \
     ((p_symbols)->spu_Init_inner) = spu_Init; \
@@ -1373,7 +1361,6 @@ struct module_symbols_t
     ((p_symbols)->LocaleFree_inner) = LocaleFree; \
     ((p_symbols)->ToLocale_inner) = ToLocale; \
     ((p_symbols)->EnsureUTF8_inner) = EnsureUTF8; \
-    ((p_symbols)->__vlc_fix_readdir_charset_inner) = __vlc_fix_readdir_charset; \
     ((p_symbols)->vlc_scandir_inner) = vlc_scandir; \
     ((p_symbols)->vlc_alphasort_inner) = vlc_alphasort; \
     ((p_symbols)->__osd_StateChange_inner) = __osd_StateChange; \
@@ -1409,7 +1396,6 @@ struct module_symbols_t
     ((p_symbols)->osd_Message_inner) = osd_Message; \
     ((p_symbols)->osd_ShowTextAbsolute_inner) = osd_ShowTextAbsolute; \
     ((p_symbols)->config_GetUserDir_inner) = config_GetUserDir; \
-    ((p_symbols)->FromUTF32_inner) = FromUTF32; \
     ((p_symbols)->__input_Read_inner) = __input_Read; \
     ((p_symbols)->__net_ConnectUDP_inner) = __net_ConnectUDP; \
     ((p_symbols)->intf_InteractionManage_inner) = intf_InteractionManage; \
@@ -1456,7 +1442,6 @@ struct module_symbols_t
     ((p_symbols)->convert_xml_special_chars_inner) = convert_xml_special_chars; \
     ((p_symbols)->unescape_URI_duplicate_inner) = unescape_URI_duplicate; \
     ((p_symbols)->resolve_xml_special_chars_inner) = resolve_xml_special_chars; \
-    ((p_symbols)->FromUTF16_inner) = FromUTF16; \
     ((p_symbols)->IsUTF8_inner) = IsUTF8; \
     ((p_symbols)->GetFallbackEncoding_inner) = GetFallbackEncoding; \
     ((p_symbols)->utf8_scandir_inner) = utf8_scandir; \
@@ -1472,15 +1457,12 @@ struct module_symbols_t
     ((p_symbols)->input_ItemGetById_inner) = input_ItemGetById; \
     ((p_symbols)->playlist_LiveSearchUpdate_inner) = playlist_LiveSearchUpdate; \
     ((p_symbols)->playlist_DeleteFromInput_inner) = playlist_DeleteFromInput; \
-    ((p_symbols)->playlist_DeleteAllFromInput_inner) = playlist_DeleteAllFromInput; \
-    ((p_symbols)->playlist_LockDeleteAllFromInput_inner) = playlist_LockDeleteAllFromInput; \
-    ((p_symbols)->playlist_AddWhereverNeeded_inner) = playlist_AddWhereverNeeded; \
-    ((p_symbols)->playlist_DeleteFromItemId_inner) = playlist_DeleteFromItemId; \
     ((p_symbols)->playlist_NodeDump_inner) = playlist_NodeDump; \
     ((p_symbols)->__intf_UserStringInput_inner) = __intf_UserStringInput; \
     ((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
     ((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
     ((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
+    ((p_symbols)->streaming_ChainToPsz_inner) = streaming_ChainToPsz; \
     ((p_symbols)->__intf_UserWarn_inner) = __intf_UserWarn; \
     ((p_symbols)->__intf_UserProgressIsCancelled_inner) = __intf_UserProgressIsCancelled; \
     ((p_symbols)->__intf_Progress_inner) = __intf_Progress; \
@@ -1508,13 +1490,24 @@ struct module_symbols_t
     ((p_symbols)->__config_ChainParse_inner) = __config_ChainParse; \
     ((p_symbols)->config_ChainDestroy_inner) = config_ChainDestroy; \
     ((p_symbols)->config_ChainCreate_inner) = config_ChainCreate; \
+    ((p_symbols)->utf8_open_inner) = utf8_open; \
+    ((p_symbols)->net_ListenSingle_inner) = net_ListenSingle; \
+    ((p_symbols)->str_format_time_inner) = str_format_time; \
+    ((p_symbols)->__str_format_meta_inner) = __str_format_meta; \
+    ((p_symbols)->vout_Snapshot_inner) = vout_Snapshot; \
+    ((p_symbols)->streaming_GuiDescToChain_inner) = streaming_GuiDescToChain; \
+    (p_symbols)->vlc_current_charset_deprecated = NULL; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__sout_CfgParse_deprecated = NULL; \
     (p_symbols)->sout_CfgCreate_deprecated = NULL; \
     (p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
     (p_symbols)->vlc_input_item_AddInfo_deprecated = NULL; \
+    (p_symbols)->playlist_LockControl_deprecated = NULL; \
+    (p_symbols)->playlist_LockClear_deprecated = NULL; \
+    (p_symbols)->playlist_AddSDModules_deprecated = NULL; \
     (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
     (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
+    (p_symbols)->playlist_ItemDelete_deprecated = NULL; \
     (p_symbols)->playlist_ItemAddParent_deprecated = NULL; \
     (p_symbols)->playlist_CopyParents_deprecated = NULL; \
     (p_symbols)->playlist_ItemSetDuration_deprecated = NULL; \
@@ -1525,9 +1518,12 @@ struct module_symbols_t
     (p_symbols)->playlist_ViewDump_deprecated = NULL; \
     (p_symbols)->playlist_ViewEmpty_deprecated = NULL; \
     (p_symbols)->playlist_ItemAdd_deprecated = NULL; \
+    (p_symbols)->playlist_NodeAddItem_deprecated = NULL; \
     (p_symbols)->playlist_Delete_deprecated = NULL; \
+    (p_symbols)->playlist_LockDelete_deprecated = NULL; \
     (p_symbols)->playlist_Disable_deprecated = NULL; \
     (p_symbols)->playlist_Enable_deprecated = NULL; \
+    (p_symbols)->playlist_LockItemToNode_deprecated = NULL; \
     (p_symbols)->playlist_Replace_deprecated = NULL; \
     (p_symbols)->playlist_LockReplace_deprecated = NULL; \
     (p_symbols)->playlist_LockItemGetById_deprecated = NULL; \
@@ -1539,7 +1535,10 @@ struct module_symbols_t
     (p_symbols)->playlist_Sort_deprecated = NULL; \
     (p_symbols)->playlist_Move_deprecated = NULL; \
     (p_symbols)->playlist_NodeGroup_deprecated = NULL; \
+    (p_symbols)->playlist_Import_deprecated = NULL; \
     (p_symbols)->playlist_NodeRemoveParent_deprecated = NULL; \
+    (p_symbols)->__vlc_fix_readdir_charset_deprecated = NULL; \
+    (p_symbols)->FromUTF32_deprecated = NULL; \
     (p_symbols)->__intf_Interact_deprecated = NULL; \
     (p_symbols)->__intf_UserProgress_deprecated = NULL; \
     (p_symbols)->__intf_UserProgressUpdate_deprecated = NULL; \
@@ -1550,18 +1549,22 @@ struct module_symbols_t
     (p_symbols)->vlc_HashInsert_deprecated = NULL; \
     (p_symbols)->vlc_HashLookup_deprecated = NULL; \
     (p_symbols)->vlc_HashRetrieve_deprecated = NULL; \
+    (p_symbols)->FromUTF16_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)->playlist_DeleteAllFromInput_deprecated = NULL; \
+    (p_symbols)->playlist_LockDeleteAllFromInput_deprecated = NULL; \
+    (p_symbols)->playlist_AddWhereverNeeded_deprecated = NULL; \
+    (p_symbols)->playlist_DeleteFromItemId_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; \