X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_symbols.h;h=b87081d18614d4a5902ae97b114d53be77522913;hb=560105460d6436d8fb7270a30c53167d7b10bd6e;hp=657b5834f1208f73035c4c7dddba56d3f849bc7a;hpb=a92603f2093140f93c34f301a22eb5763abc4232;p=vlc diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index 657b5834f1..b87081d186 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -7,426 +7,8 @@ # define __VLC_SYMBOLS_H # ifdef HAVE_SHARED_LIBVLC -/* - * In an ideal world, plugins would include all the headers they need. - * But of course, many, if not all, of them don't, so we have to make sure - * the whole libvlc API is defined here in any case when included from a - * plugin. - */ -# ifdef __PLUGIN__ -# ifdef __cplusplus -extern "C" { -# endif -char * config_GetHomeDir (void); -int playlist_ItemDelete (playlist_item_t *); -osd_state_t * __osd_StateChange (osd_state_t *, const int); -int vlm_ScheduleSetup (vlm_schedule_t *, char *, char *); -vlc_acl_t * __ACL_Duplicate (vlc_object_t *p_this, const vlc_acl_t *p_acl); -int osd_Slider (vlc_object_t *, spu_t *, int, int, int, int, short); -int playlist_ServicesDiscoveryRemove (playlist_t *, const char *); -int playlist_NodeDelete (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t); -void vlm_MediaDelete (vlm_t *, vlm_media_t *, char *); -int __var_Destroy (vlc_object_t *, const char *); -int playlist_ItemSetDuration (playlist_item_t *, mtime_t); -void aout_Delete (aout_instance_t *); -int playlist_Control (playlist_t *, int, ...); -vlc_acl_t * __ACL_Create (vlc_object_t *p_this, vlc_bool_t b_allow); -playlist_item_t * playlist_ItemGetByPos (playlist_t *, int); -int playlist_Clear (playlist_t *); -vout_thread_t * __vout_Create (vlc_object_t *, video_format_t *); -void aout_FormatPrint (aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format); -void vlm_ScheduleDelete (vlm_t *, vlm_schedule_t *, char *); -void osd_ConfigUnload (vlc_object_t *, osd_menu_t **); -void input_DecoderDelete (decoder_t *); -void __msg_Info (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); -int playlist_ViewDump (playlist_t *, playlist_view_t *); -int __net_Select (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); -aout_instance_t * __aout_New (vlc_object_t *); -const char * VLC_Compiler (void); -void vout_DatePicture (vout_thread_t *, picture_t *, mtime_t); -int __var_Type (vlc_object_t *, const char *); -int vlc_strncasecmp (const char *s1, const char *s2, size_t n); -int vlc_getaddrinfo (vlc_object_t *, const char *, int, const struct addrinfo *, struct addrinfo **); -void access2_Delete (access_t *); -void vout_SynchroNewPicture (vout_synchro_t *, int, int, mtime_t, mtime_t, int, vlc_bool_t); -int __vout_AllocatePicture (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect); -playlist_item_t * playlist_NodeCreate (playlist_t *,int,char *, playlist_item_t * p_parent); -void * vlc_readdir (void *); -int sout_AnnounceRegister (sout_instance_t *,session_descriptor_t*, announce_method_t*); -int osd_ShowTextRelative (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t); -void * __vlc_object_get (vlc_object_t *, int); -void vout_SynchroTrash (vout_synchro_t *); -picture_t * vout_CreatePicture (vout_thread_t *, vlc_bool_t, vlc_bool_t, unsigned int); -void vout_SynchroEnd (vout_synchro_t *, int, vlc_bool_t); -int playlist_ItemSetName (playlist_item_t *, char *); -void __osd_MenuShow (vlc_object_t *); -httpd_url_t * httpd_UrlNewUnique (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl); -void httpd_ClientModeStream (httpd_client_t *cl); -void httpd_RedirectDelete (httpd_redirect_t *); -void __sout_CfgParse (vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t *); -vlm_media_t * vlm_MediaNew (vlm_t *, char *, int); -int playlist_LockItemToNode (playlist_t *,playlist_item_t *); -void spu_Destroy (spu_t *); -int osd_Icon (vlc_object_t *, spu_t *, int, int, int, short); -char* httpd_ServerIP (httpd_client_t *cl, char *psz_ip); -int spu_Init (spu_t *); -void httpd_HostDelete (httpd_host_t *); -int __aout_VolumeGet (vlc_object_t *, audio_volume_t *); -void spu_DestroySubpicture (spu_t *, subpicture_t *); -int aout_CheckChannelReorder (const uint32_t *, const uint32_t *, uint32_t, int, int *); -void stream_DemuxSend (stream_t *s, block_t *p_block); -int __config_LoadConfigFile (vlc_object_t *, const char *); -int vlc_asprintf (char **, const char *, ...); -int __var_Change (vlc_object_t *, const char *, int, vlc_value_t *, vlc_value_t *); -int playlist_Disable (playlist_t *, playlist_item_t *); -char * vlc_input_item_GetInfo (input_item_t *p_i, const char *psz_cat,const char *psz_name); -int vout_VarCallback (vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *); -session_descriptor_t* sout_AnnounceSessionCreate (void); -void __osd_Volume (vlc_object_t *); -int vlc_vasprintf (char **, const char *, va_list); -int playlist_Sort (playlist_t *, int, int); -int aout_DecDelete (aout_instance_t *, aout_input_t *); -int vlc_strcasecmp (const char *s1, const char *s2); -sout_packetizer_input_t * sout_InputNew (sout_instance_t *, es_format_t *); -char * secstotimestr (char *psz_buffer, int secs); -int playlist_NodeInsert (playlist_t *,int,playlist_item_t*,playlist_item_t *, int); -void tls_ClientDelete (tls_session_t *); -void msleep (mtime_t delay); -const char * VLC_Error (int); -sout_access_out_t * sout_AccessOutNew (sout_instance_t *, char *psz_access, char *psz_name); -int playlist_Replace (playlist_t *,playlist_item_t *, input_item_t*); -int __config_LoadCmdLine (vlc_object_t *, int *, char *[], vlc_bool_t); -void __config_PutInt (vlc_object_t *, const char *, int); -vlm_t * __vlm_New (vlc_object_t *); -int __input_Preparse (vlc_object_t *, input_item_t *); -int vlc_input_item_AddInfo (input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ...); -void __msg_Unsubscribe (vlc_object_t *, msg_subscription_t *); -void aout_DateSet (audio_date_t *, mtime_t); -char * FromLocale (const char *); -int playlist_ViewInsert (playlist_t *, int, char *); -char * __vlc_fix_readdir_charset (vlc_object_t *, const char *); -int __config_GetInt (vlc_object_t *, const char *); -void input_DecoderDecode (decoder_t *, block_t *); -void * vout_RequestWindow (vout_thread_t *, int *, int *, unsigned int *, unsigned int *); -char * vlc_getenv (const char *name); -block_t * block_FifoShow (block_fifo_t *); -void sout_MuxSendBuffer (sout_mux_t *, sout_input_t *, block_t *); -void __osd_MenuNext (vlc_object_t *); -void vlm_MessageDelete (vlm_message_t *); -void vout_SynchroDecode (vout_synchro_t *); -int playlist_Delete (playlist_t *, int); -void aout_FiltersPlay (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters, aout_buffer_t ** pp_input_buffer); -char* httpd_ClientIP (httpd_client_t *cl, char *psz_ip); -void httpd_FileDelete (httpd_file_t *); -module_t * __module_Need (vlc_object_t *, const char *, const char *, vlc_bool_t); -const char * VLC_Changeset (void); -void LocaleFree (const char *); -void __vlc_object_attach (vlc_object_t *, vlc_object_t *); -stream_t * __stream_UrlNew (vlc_object_t *p_this, const char *psz_url); -sout_mux_t * sout_MuxNew (sout_instance_t*, char *, sout_access_out_t *); -stream_t * __stream_DemuxNew (vlc_object_t *p_obj, char *psz_demux, es_out_t *out); -int vout_ShowTextRelative (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t); -int block_FifoPut (block_fifo_t *, block_t *); -int playlist_ItemAddParent (playlist_item_t *, int,playlist_item_t *); -int __var_Create (vlc_object_t *, const char *, int); -void httpd_ClientModeBidir (httpd_client_t *cl); -mtime_t mdate (void); -void demux2_Delete (demux_t *); -void __msg_Dbg (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); -int vlc_getnameinfo (const struct sockaddr *, int, char *, int, int *, int); -int vlm_ExecuteCommand (vlm_t *, char *, vlm_message_t **); -httpd_stream_t * httpd_StreamNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl); -int __config_GetType (vlc_object_t *, const char *); -void __vlc_thread_ready (vlc_object_t *); -int playlist_Export (playlist_t *, const char *, const char *); -demux_t * __demux2_New (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t); -int __vlc_threads_end (vlc_object_t *); -int sout_AccessOutRead (sout_access_out_t *, block_t *); -int demux2_vaControlHelper (stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args); -int httpd_UrlCatch (httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t *); -void __vlc_object_yield (vlc_object_t *); -const char * VLC_CompileBy (void); -playlist_item_t * playlist_LockItemGetByPos (playlist_t *, int); -input_thread_t * __input_CreateThread (vlc_object_t *, input_item_t *); -const char * DecodeLanguage (uint16_t); -int __aout_VolumeSet (vlc_object_t *, audio_volume_t); -void InitMD5 (struct md5_s *); -mtime_t aout_DateIncrement (audio_date_t *, uint32_t); -int __net_Write (vlc_object_t *p_this, int fd, v_socket_t *, const uint8_t *p_data, int i_data); -int playlist_GetPositionById (playlist_t *,int); -int vlc_iconv_close (vlc_iconv_t); -int * __net_ListenTCP (vlc_object_t *, const char *, int); -void EndMD5 (struct md5_s *); -tls_server_t * tls_ServerCreate (vlc_object_t *, const char *, const char *); -int vlm_MediaSetup (vlm_t *, vlm_media_t *, char *, char *); -void sout_StreamDelete (sout_stream_t *); -int vout_ShowTextAbsolute (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t); -void __osd_MenuDelete (vlc_object_t *, osd_menu_t *); -int sout_AnnounceUnRegister (sout_instance_t *,session_descriptor_t*); -vlc_bool_t vlc_ureduce (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t); -httpd_host_t * httpd_HostNew (vlc_object_t *, const char *psz_host, int i_port); -char * vlc_strcasestr (const char *s1, const char *s2); -httpd_file_t * httpd_FileNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t *); -void vlc_freeaddrinfo (struct addrinfo *); -void vlm_Delete (vlm_t *); -void httpd_HandlerDelete (httpd_handler_t *); -void vout_DisplayPicture (vout_thread_t *, picture_t *); -void httpd_MsgClean (httpd_message_t *); -int vout_ControlWindow (vout_thread_t *, void *, int, va_list); -int playlist_NodeChildrenCount (playlist_t *,playlist_item_t*); -size_t vlc_iconv (vlc_iconv_t, char **, size_t *, char **, size_t *); -int playlist_Enable (playlist_t *, playlist_item_t *); -playlist_item_t* __playlist_ItemCopy (vlc_object_t *,playlist_item_t*); -char * vlc_strdup (const char *s); -playlist_item_t* __playlist_ItemNew (vlc_object_t *,const char *,const char *); -int __net_OpenTCP (vlc_object_t *p_this, const char *psz_host, int i_port); -int __var_Get (vlc_object_t *, const char *, vlc_value_t *); -void tls_ServerDelete (tls_server_t *); -unsigned int aout_FormatNbChannels (const audio_sample_format_t * p_format); -int __vlc_mutex_destroy (char *, int, vlc_mutex_t *); -vlc_bool_t playlist_IsServicesDiscoveryLoaded (playlist_t *,const char *); -int vlm_Save (vlm_t *, char *); -int ACL_AddNet (vlc_acl_t *p_acl, const char *psz_ip, int i_len, vlc_bool_t b_allow); -void AddMD5 (struct md5_s *, const uint8_t *, uint32_t); -void config_Duplicate (module_t *, module_config_t *); -block_t * __block_New (vlc_object_t *, int); -void xml_Delete (xml_t *); -void __msg_Warn (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); -httpd_host_t * httpd_TLSHostNew (vlc_object_t *, const char *, int, const char *, const char *, const char *, const char *); -int vlc_scandir (const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** )); -int sout_AccessOutWrite (sout_access_out_t *, block_t *); -struct dirent * vlc_readdir_wrapper (void *); -void config_UnsetCallbacks (module_config_t *); -void vout_SynchroRelease (vout_synchro_t *); -void __msg_Generic (vlc_object_t *, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 4, 5); -int vlc_closedir_wrapper (void *); -int playlist_ServicesDiscoveryAdd (playlist_t *, const char *); -char * vlc_strndup (const char *s, size_t n); -void vout_PlacePicture (vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int *); -float __config_GetFloat (vlc_object_t *, const char *); -playlist_item_t * playlist_ItemGetById (playlist_t *, int); -const char * vlc_gai_strerror (int); -void net_ListenClose (int *fd); -int __vlc_execve (vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data); -int playlist_NodeAppend (playlist_t *,int,playlist_item_t*,playlist_item_t *); -const iso639_lang_t * GetLang_2B (const char *); -void sout_AccessOutDelete (sout_access_out_t *); -int httpd_StreamHeader (httpd_stream_t *, uint8_t *p_data, int i_data); -void __config_PutFloat (vlc_object_t *, const char *, float); -void vout_OSDIcon (vlc_object_t *, int, short); -void __vlc_thread_join (vlc_object_t *, char *, int); -void __vlc_object_release (vlc_object_t *); -int __var_Set (vlc_object_t *, const char *, vlc_value_t); -void vout_LinkPicture (vout_thread_t *, picture_t *); -void vout_DestroyPicture (vout_thread_t *, picture_t *); -int64_t vlc_strtoll (const char *nptr, char **endptr, int base); -void __osd_MenuHide (vlc_object_t *); -subpicture_region_t * __spu_MakeRegion (vlc_object_t *, video_format_t *, picture_t *); -void sout_AnnounceSessionDestroy (session_descriptor_t *); -subpicture_region_t * __spu_CreateRegion (vlc_object_t *, video_format_t *); -int playlist_AddSDModules (playlist_t *, char *); -void vout_Destroy (vout_thread_t *); -block_fifo_t * __block_FifoNew (vlc_object_t *); -int playlist_NodeSort (playlist_t *, playlist_item_t *,int, int); -int osd_ConfigLoader (vlc_object_t *, const char *, osd_menu_t **); -int aout_Restart (aout_instance_t * p_aout); -void * __vlc_object_create (vlc_object_t *, int); -int __aout_VolumeInfos (vlc_object_t *, audio_volume_t *); -const iso639_lang_t * GetLang_2T (const char *); -int playlist_NodeAddItem (playlist_t *, playlist_item_t *,int,playlist_item_t *,int , int); -int __aout_VolumeMute (vlc_object_t *, audio_volume_t *); -const char * VLC_CompileDomain (void); -void input_DestroyThread (input_thread_t *); -int playlist_LockControl (playlist_t *, int, ...); -vlc_bool_t vlc_current_charset (char **); -char * __net_Gets (vlc_object_t *p_this, int fd, v_socket_t *); -void aout_DateMove (audio_date_t *, mtime_t); -void sout_MuxDelete (sout_mux_t *); -void vout_InitFormat (video_frame_format_t *, uint32_t, int, int, int); -void vout_UnlinkPicture (vout_thread_t *, picture_t *); -const char * aout_FormatPrintChannels (const audio_sample_format_t *); -char * __config_GetPsz (vlc_object_t *, const char *); -void httpd_StreamDelete (httpd_stream_t *); -image_handler_t * __image_HandlerCreate (vlc_object_t *); -void vout_OSDSlider (vlc_object_t *, int, int , short); -aout_buffer_t * aout_DecNewBuffer (aout_instance_t *, aout_input_t *, size_t); -int vout_ChromaCmp (uint32_t, uint32_t); -int sout_InputDelete (sout_packetizer_input_t *); -int playlist_Import (playlist_t *, const char *); -access_t * access2_FilterNew (access_t *p_source, char *psz_access_filter); -const char * VLC_CompileHost (void); -httpd_url_t * httpd_UrlNew (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl); -int __vlc_thread_create (vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), int, vlc_bool_t); -void __module_Unneed (vlc_object_t *, module_t *); -int net_Printf (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, ...); -int __vlc_thread_set_priority (vlc_object_t *, char *, int, int); -int ACL_LoadFile (vlc_acl_t *p_acl, const char *path); -void input_StopThread (input_thread_t *); -intf_thread_t * __intf_Create (vlc_object_t *, const char *); -void aout_ChannelReorder (uint8_t *, int, int, const int *, int); -int __var_DelCallback (vlc_object_t *, const char *, vlc_callback_t, void *); -void __vlc_object_detach (vlc_object_t *); -int aout_FindAndRestart (vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *); -int sout_InputSendBuffer (sout_packetizer_input_t *, block_t*); -int __config_SaveConfigFile (vlc_object_t *, const char *); -int ACL_Check (vlc_acl_t *p_acl, const char *psz_ip); -void aout_DecDeleteBuffer (aout_instance_t *, aout_input_t *, aout_buffer_t *); -access_t * __access2_New (vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, vlc_bool_t b_quick); -tls_session_t * tls_ClientCreate (vlc_object_t *, int, const char *); -void intf_Destroy (intf_thread_t *); -void spu_RenderSubpictures (spu_t *, video_format_t *, picture_t *, picture_t *, subpicture_t *, int, int); -void __msg_Err (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); -void __spu_DestroyRegion (vlc_object_t *, subpicture_region_t *); -int playlist_ItemAdd (playlist_t *, playlist_item_t *, int, int); -aout_buffer_t * aout_OutputNextBuffer (aout_instance_t *, mtime_t, vlc_bool_t); -int playlist_LockReplace (playlist_t *,playlist_item_t *, input_item_t*); -int __intf_Eject (vlc_object_t *, const char *); -int input_Control (input_thread_t *, int i_query, ...); -int __aout_VolumeUp (vlc_object_t *, int, audio_volume_t *); -void osd_Message (spu_t *, int, char *, ...); -vout_thread_t * __vout_Request (vlc_object_t *, vout_thread_t *, video_format_t *); -void __osd_MenuUp (vlc_object_t *); -int __aout_VolumeDown (vlc_object_t *, int, audio_volume_t *); -sout_instance_t * __sout_NewInstance (vlc_object_t *, char *); -subpicture_t * spu_CreateSubpicture (spu_t *); -void httpd_MsgAdd (httpd_message_t *, char *psz_name, char *psz_value, ...); -int vout_vaControlDefault (vout_thread_t *, int, va_list); -int playlist_NodeEmpty (playlist_t *, playlist_item_t *, vlc_bool_t); -spu_t * __spu_Create (vlc_object_t *); -int playlist_NodeRemoveItem (playlist_t *,playlist_item_t*,playlist_item_t *); -int __net_Accept (vlc_object_t *, int *, mtime_t); -void ACL_Destroy (vlc_acl_t *p_acl); -void vout_ReleaseWindow (vout_thread_t *, void *); -void __osd_MenuDown (vlc_object_t *); -int playlist_ViewDelete (playlist_t *,playlist_view_t*); -void vout_SynchroReset (vout_synchro_t *); -void date_Change (date_t *, uint32_t, uint32_t); -int playlist_LockDelete (playlist_t *, int); -mtime_t vout_SynchroDate (vout_synchro_t *); -int __var_AddCallback (vlc_object_t *, const char *, vlc_callback_t, void *); -void httpd_MsgInit (httpd_message_t *); -char * EnsureUTF8 (char *); -block_t * block_FifoGet (block_fifo_t *); -mtime_t date_Increment (date_t *, uint32_t); -int playlist_Add (playlist_t *, const char *, const char *, int, int); -char * sout_CfgCreate (char **, sout_cfg_t **, char *); -osd_menu_t * __osd_MenuCreate (vlc_object_t *, const char *); -void * vlc_opendir (const char *); -int playlist_NodeRemoveParent (playlist_t *,playlist_item_t*,playlist_item_t *); -char ** vlc_parse_cmdline (const char *, int *); -int __vlc_cond_init (vlc_object_t *, vlc_cond_t *); -int __net_OpenUDP (vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server); -vlc_iconv_t vlc_iconv_open (const char *, const char *); -int playlist_PreparseEnqueue (playlist_t *, input_item_t *); -aout_buffer_t * aout_FifoPop (aout_instance_t * p_aout, aout_fifo_t * p_fifo); -int __vout_InitPicture (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect); -int playlist_LockClear (playlist_t *); -char * mstrtime (char *psz_buffer, mtime_t date); -void aout_FormatPrepare (audio_sample_format_t * p_format); -void spu_DisplaySubpicture (spu_t *, subpicture_t *); -int httpd_StreamSend (httpd_stream_t *, uint8_t *p_data, int i_data); -decoder_t * input_DecoderNew (input_thread_t *, es_format_t *, vlc_bool_t b_force_decoder); -int intf_RunThread (intf_thread_t *); -xml_t * __xml_Create (vlc_object_t *); -msg_subscription_t* __msg_Subscribe (vlc_object_t *); -const char * VLC_Version (void); -session_descriptor_t* sout_AnnounceRegisterSDP (sout_instance_t *,const char *, announce_method_t*); -char * stream_ReadLine (stream_t *); -int playlist_PreparseEnqueueItem (playlist_t *, playlist_item_t *); -void __osd_MenuPrev (vlc_object_t *); -void date_Set (date_t *, mtime_t); -module_t * config_FindModule (vlc_object_t *, const char *); -void aout_VolumeSoftInit (aout_instance_t *); -void block_FifoRelease (block_fifo_t *); -void block_FifoEmpty (block_fifo_t *); -int playlist_ItemAddOption (playlist_item_t *, const char *); -void aout_VolumeNoneInit (aout_instance_t *); -void aout_DateInit (audio_date_t *, uint32_t); -void * vlc_opendir_wrapper (const char *); -void vlc_list_release (vlc_list_t *); -subpicture_t * spu_SortSubpictures (spu_t *, mtime_t); -playlist_item_t * playlist_LockItemGetByInput (playlist_t *,input_item_t *); -int __net_vaPrintf (vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, va_list args); -int vlm_MediaControl (vlm_t *, vlm_media_t *, char *, char *, char *); -vlc_bool_t vout_SynchroChoose (vout_synchro_t *, int, int, vlc_bool_t); -int playlist_RecursiveNodeSort (playlist_t *, playlist_item_t *,int, int); -int64_t vlc_atoll (const char *nptr); -int vlm_MediaVodControl (void *, vod_media_t *, char *, int, va_list); -void __vlc_object_destroy (vlc_object_t *); -int sout_AccessOutSeek (sout_access_out_t *, off_t); -double vlc_atof (const char *nptr); -void httpd_UrlDelete (httpd_url_t *); -int __vlc_mutex_init (vlc_object_t *, vlc_mutex_t *); -int __net_ReadNonBlock (vlc_object_t *p_this, int fd, v_socket_t *, uint8_t *p_data, int i_data, mtime_t i_wait); -playlist_view_t * playlist_ViewFind (playlist_t *, int); -module_config_t * config_FindConfig (vlc_object_t *, const char *); -playlist_item_t * playlist_ItemGetByInput (playlist_t *,input_item_t *); -void config_SetCallbacks (module_config_t *, module_config_t *); -int __vlc_cond_destroy (char *, int, vlc_cond_t *); -httpd_handler_t * httpd_HandlerNew (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *); -vlc_list_t * __vlc_list_find (vlc_object_t *, int, int); -char * ToLocale (const char *); -int vlm_Load (vlm_t *, char *); -int aout_FiltersCreatePipeline (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format); -playlist_item_t * playlist_ChildSearchName (playlist_item_t*, const char*); -void __msg_GenericVa (vlc_object_t *, int, const char *, const char *, va_list args); -int aout_ChannelsRestart (vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *); -char const * vlc_error (int); -int playlist_NodeGroup (playlist_t *, int,playlist_item_t *,playlist_item_t **,int, int, int); -playlist_item_t* playlist_ItemNewWithType (vlc_object_t *,const char *,const char *, int); -void __config_PutPsz (vlc_object_t *, const char *, const char *); -vlm_schedule_t * vlm_ScheduleNew (vlm_t *, char *); -int osd_ShowTextAbsolute (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t); -void net_Close (int fd); -int __vlc_threads_init (vlc_object_t *); -void __vout_CopyPicture (vlc_object_t *p_this, picture_t *p_dst, picture_t *p_src); -void sout_MuxDeleteStream (sout_mux_t *, sout_input_t *); -char * httpd_MsgGet (httpd_message_t *, char *psz_name); -const iso639_lang_t * GetLang_1 (const char *); -void aout_FormatsPrint (aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format1, const audio_sample_format_t * p_format2); -void __vout_OSDMessage (vlc_object_t *, int, char *, ...); -void intf_StopThread (intf_thread_t *); -stream_t * __stream_MemoryNew (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, vlc_bool_t i_preserve_memory); -void mwait (mtime_t date); -void __config_ResetAll (vlc_object_t *); -httpd_redirect_t * httpd_RedirectNew (httpd_host_t *, const char *psz_url_dst, const char *psz_url_src); -playlist_item_t * playlist_LockItemGetById (playlist_t *, int); -mtime_t date_Get (const date_t *); -int aout_DecPlay (aout_instance_t *, aout_input_t *, aout_buffer_t *); -int input_vaControl (input_thread_t *, int i_query, va_list); -mtime_t aout_FifoFirstDate (aout_instance_t *, aout_fifo_t *); -vout_synchro_t * __vout_SynchroInit (vlc_object_t *, int); -int vlc_alphasort (const struct dirent **a, const struct dirent **b); -mtime_t aout_DateGet (const audio_date_t *); -int playlist_CopyParents (playlist_item_t *,playlist_item_t *); -int playlist_Move (playlist_t *, int, int); -void date_Init (date_t *, uint32_t, uint32_t); -void DigestMD5 (struct md5_s *, uint32_t *); -void image_HandlerDelete (image_handler_t *); -int __net_Read (vlc_object_t *p_this, int fd, v_socket_t *, uint8_t *p_data, int i_data, vlc_bool_t b_retry); -char * vlc_dgettext (const char *package, const char *msgid); -void sout_DeleteInstance (sout_instance_t *); -int playlist_ItemToNode (playlist_t *,playlist_item_t *); -void stream_DemuxDelete (stream_t *s); -aout_input_t * __aout_DecNew (vlc_object_t *, aout_instance_t **, audio_sample_format_t *); -int playlist_AddExt (playlist_t *, const char *, const char *, int, int, mtime_t, const char **,int); -void date_Move (date_t *, mtime_t); -int vlc_closedir (void *); -void aout_FiltersDestroyPipeline (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters); -void * __vlc_object_find (vlc_object_t *, int, int); -announce_method_t* sout_AnnounceMethodCreate (int); -sout_input_t * sout_MuxAddStream (sout_mux_t *, es_format_t *); -void __osd_MenuActivate (vlc_object_t *); -sout_stream_t * sout_StreamNew (sout_instance_t *, char *psz_chain); -int playlist_ViewEmpty (playlist_t *, int, vlc_bool_t); -block_t * block_Realloc (block_t *, int i_pre, int i_body); -char * vlc_wraptext (const char *, int, vlc_bool_t); -int playlist_ViewUpdate (playlist_t *, int); -# ifdef __cplusplus -} -# endif -# endif /* __PLUGIN__ */ -# else /* HAVE_LIBVLC_SHARED */ +# error You are not supposed to include this file! +# endif /* * This is the big VLC API structure for plugins : * Changing its layout breaks plugin's binary compatibility, @@ -510,18 +92,18 @@ struct module_symbols_t void (*date_Move_inner) (date_t *, mtime_t); mtime_t (*date_Increment_inner) (date_t *, uint32_t); void *net_ConvertIPv4_deprecated; - int (*__net_OpenTCP_inner) (vlc_object_t *p_this, const char *psz_host, int i_port); + int (*__net_ConnectTCP_inner) (vlc_object_t *p_this, const char *psz_host, int i_port); int * (*__net_ListenTCP_inner) (vlc_object_t *, const char *, int); 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 *, ...); @@ -547,7 +129,7 @@ struct module_symbols_t sout_stream_t * (*sout_StreamNew_inner) (sout_instance_t *, char *psz_chain); void (*sout_StreamDelete_inner) (sout_stream_t *); int (*sout_AnnounceRegister_inner) (sout_instance_t *,session_descriptor_t*, announce_method_t*); - session_descriptor_t* (*sout_AnnounceRegisterSDP_inner) (sout_instance_t *,const char *, announce_method_t*); + session_descriptor_t* (*sout_AnnounceRegisterSDP_inner) (sout_instance_t *,const char *, const char *, announce_method_t*); int (*sout_AnnounceUnRegister_inner) (sout_instance_t *,session_descriptor_t*); session_descriptor_t* (*sout_AnnounceSessionCreate_inner) (void); void (*sout_AnnounceSessionDestroy_inner) (session_descriptor_t *); @@ -604,9 +186,9 @@ struct module_symbols_t int (*vlc_closedir_inner) (void *); vlc_bool_t (*vlc_ureduce_inner) (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t); char ** (*vlc_parse_cmdline_inner) (const char *, int *); - char * (*vlc_wraptext_inner) (const char *, int, vlc_bool_t); + char * (*vlc_wraptext_inner) (const char *, int); vlc_iconv_t (*vlc_iconv_open_inner) (const char *, const char *); - size_t (*vlc_iconv_inner) (vlc_iconv_t, char **, size_t *, char **, size_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); @@ -622,7 +204,7 @@ struct module_symbols_t void (*httpd_UrlDelete_inner) (httpd_url_t *); void (*httpd_ClientModeStream_inner) (httpd_client_t *cl); void (*httpd_ClientModeBidir_inner) (httpd_client_t *cl); - char* (*httpd_ClientIP_inner) (httpd_client_t *cl, char *psz_ip); + char* (*httpd_ClientIP_inner) (const httpd_client_t *cl, char *psz_ip); httpd_file_t * (*httpd_FileNew_inner) (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t *); void (*httpd_FileDelete_inner) (httpd_file_t *); httpd_redirect_t * (*httpd_RedirectNew_inner) (httpd_host_t *, const char *psz_url_dst, const char *psz_url_src); @@ -652,17 +234,17 @@ 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 *); + intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, char **); int (*intf_RunThread_inner) (intf_thread_t *); void (*intf_StopThread_inner) (intf_thread_t *); void (*intf_Destroy_inner) (intf_thread_t *); - void (*__msg_Generic_inner) (vlc_object_t *, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 4, 5); - void (*__msg_GenericVa_inner) (vlc_object_t *, int, const char *, const char *, va_list args); + void (*__msg_Generic_inner) (vlc_object_t *, int, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 5, 6); + void (*__msg_GenericVa_inner) (vlc_object_t *, int, int, const char *, const char *, va_list args); void (*__msg_Info_inner) (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); void (*__msg_Err_inner) (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); void (*__msg_Warn_inner) (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); void (*__msg_Dbg_inner) (vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3); - msg_subscription_t* (*__msg_Subscribe_inner) (vlc_object_t *); + msg_subscription_t* (*__msg_Subscribe_inner) (vlc_object_t *, int); void (*__msg_Unsubscribe_inner) (vlc_object_t *, msg_subscription_t *); void * (*__vlc_object_create_inner) (vlc_object_t *, int); void (*__vlc_object_destroy_inner) (vlc_object_t *); @@ -676,62 +258,62 @@ struct module_symbols_t void (*vlc_list_release_inner) (vlc_list_t *); int (*playlist_Control_inner) (playlist_t *, int, ...); int (*playlist_LockControl_inner) (playlist_t *, int, ...); - int (*playlist_Clear_inner) (playlist_t *); - int (*playlist_LockClear_inner) (playlist_t *); + void (*playlist_Clear_inner) (playlist_t *); + void (*playlist_LockClear_inner) (playlist_t *); 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 *); vlc_bool_t (*playlist_IsServicesDiscoveryLoaded_inner) (playlist_t *,const char *); - playlist_item_t* (*__playlist_ItemNew_inner) (vlc_object_t *,const char *,const char *); - playlist_item_t* (*__playlist_ItemCopy_inner) (vlc_object_t *,playlist_item_t*); - playlist_item_t* (*playlist_ItemNewWithType_inner) (vlc_object_t *,const char *,const char *, int); + 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 *); - int (*playlist_ItemAddParent_inner) (playlist_item_t *, int,playlist_item_t *); - int (*playlist_CopyParents_inner) (playlist_item_t *,playlist_item_t *); + void *playlist_ItemAddParent_deprecated; + void *playlist_CopyParents_deprecated; int (*playlist_ItemSetName_inner) (playlist_item_t *, char *); - int (*playlist_ItemSetDuration_inner) (playlist_item_t *, mtime_t); - int (*playlist_ViewInsert_inner) (playlist_t *, int, char *); - int (*playlist_ViewDelete_inner) (playlist_t *,playlist_view_t*); - playlist_view_t * (*playlist_ViewFind_inner) (playlist_t *, int); - int (*playlist_ViewUpdate_inner) (playlist_t *, int); - int (*playlist_ViewDump_inner) (playlist_t *, playlist_view_t *); - int (*playlist_ViewEmpty_inner) (playlist_t *, int, vlc_bool_t); - playlist_item_t * (*playlist_NodeCreate_inner) (playlist_t *,int,char *, playlist_item_t * p_parent); - int (*playlist_NodeAppend_inner) (playlist_t *,int,playlist_item_t*,playlist_item_t *); - int (*playlist_NodeInsert_inner) (playlist_t *,int,playlist_item_t*,playlist_item_t *, int); + void *playlist_ItemSetDuration_deprecated; + void *playlist_ViewInsert_deprecated; + void *playlist_ViewDelete_deprecated; + void *playlist_ViewFind_deprecated; + 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); + 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 *); int (*playlist_NodeChildrenCount_inner) (playlist_t *,playlist_item_t*); playlist_item_t * (*playlist_ChildSearchName_inner) (playlist_item_t*, const char*); 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); - int (*playlist_AddExt_inner) (playlist_t *, const char *, const char *, int, int, mtime_t, const char **,int); - int (*playlist_ItemAdd_inner) (playlist_t *, playlist_item_t *, int, int); - int (*playlist_NodeAddItem_inner) (playlist_t *, playlist_item_t *,int,playlist_item_t *,int , int); - int (*playlist_Delete_inner) (playlist_t *, int); + 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); + void *playlist_ItemAdd_deprecated; + void (*playlist_NodeAddItem_inner) (playlist_t *, playlist_item_t *, playlist_item_t *,int , int); + void *playlist_Delete_deprecated; int (*playlist_LockDelete_inner) (playlist_t *, int); - int (*playlist_Disable_inner) (playlist_t *, playlist_item_t *); - int (*playlist_Enable_inner) (playlist_t *, playlist_item_t *); - int (*playlist_ItemToNode_inner) (playlist_t *,playlist_item_t *); - int (*playlist_LockItemToNode_inner) (playlist_t *,playlist_item_t *); - int (*playlist_Replace_inner) (playlist_t *,playlist_item_t *, input_item_t*); - int (*playlist_LockReplace_inner) (playlist_t *,playlist_item_t *, input_item_t*); + 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 *); + void *playlist_Replace_deprecated; + void *playlist_LockReplace_deprecated; playlist_item_t * (*playlist_ItemGetById_inner) (playlist_t *, int); - playlist_item_t * (*playlist_LockItemGetById_inner) (playlist_t *, int); - playlist_item_t * (*playlist_ItemGetByPos_inner) (playlist_t *, int); - playlist_item_t * (*playlist_LockItemGetByPos_inner) (playlist_t *, int); + 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_LockItemGetByInput_inner) (playlist_t *,input_item_t *); - int (*playlist_GetPositionById_inner) (playlist_t *,int); - int (*playlist_ItemAddOption_inner) (playlist_item_t *, const char *); - int (*playlist_Sort_inner) (playlist_t *, int, int); - int (*playlist_Move_inner) (playlist_t *, int, int); - int (*playlist_NodeGroup_inner) (playlist_t *, int,playlist_item_t *,playlist_item_t **,int, int, int); + void *playlist_LockItemGetByInput_deprecated; + void *playlist_GetPositionById_deprecated; + void *playlist_ItemAddOption_deprecated; + void *playlist_Sort_deprecated; + void *playlist_Move_deprecated; + 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 *); - int (*playlist_Export_inner) (playlist_t *, const char *, const char *); + 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 *); spu_t * (*__spu_Create_inner) (vlc_object_t *); int (*spu_Init_inner) (spu_t *); void (*spu_Destroy_inner) (spu_t *); @@ -741,7 +323,7 @@ struct module_symbols_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); @@ -764,18 +346,18 @@ struct module_symbols_t int (*__vout_AllocatePicture_inner) (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect); vlm_t * (*__vlm_New_inner) (vlc_object_t *); void (*vlm_Delete_inner) (vlm_t *); - int (*vlm_ExecuteCommand_inner) (vlm_t *, char *, vlm_message_t **); + int (*vlm_ExecuteCommand_inner) (vlm_t *, const char *, vlm_message_t **); void (*vlm_MessageDelete_inner) (vlm_message_t *); - vlm_media_t * (*vlm_MediaNew_inner) (vlm_t *, char *, int); - void (*vlm_MediaDelete_inner) (vlm_t *, vlm_media_t *, char *); - int (*vlm_MediaSetup_inner) (vlm_t *, vlm_media_t *, char *, char *); - int (*vlm_MediaControl_inner) (vlm_t *, vlm_media_t *, char *, char *, char *); - vlm_schedule_t * (*vlm_ScheduleNew_inner) (vlm_t *, char *); - void (*vlm_ScheduleDelete_inner) (vlm_t *, vlm_schedule_t *, char *); - int (*vlm_ScheduleSetup_inner) (vlm_schedule_t *, char *, char *); - int (*vlm_MediaVodControl_inner) (void *, vod_media_t *, char *, int, va_list); - int (*vlm_Save_inner) (vlm_t *, char *); - int (*vlm_Load_inner) (vlm_t *, char *); + vlm_media_t * (*vlm_MediaNew_inner) (vlm_t *, const char *, int); + void (*vlm_MediaDelete_inner) (vlm_t *, vlm_media_t *, const char *); + int (*vlm_MediaSetup_inner) (vlm_t *, vlm_media_t *, const char *, const char *); + int (*vlm_MediaControl_inner) (vlm_t *, vlm_media_t *, const char *, const char *, const char *); + vlm_schedule_t * (*vlm_ScheduleNew_inner) (vlm_t *, const char *); + void (*vlm_ScheduleDelete_inner) (vlm_t *, vlm_schedule_t *, const char *); + int (*vlm_ScheduleSetup_inner) (vlm_schedule_t *, const char *, const char *); + int (*vlm_MediaVodControl_inner) (void *, vod_media_t *, const char *, int, va_list); + int (*vlm_Save_inner) (vlm_t *, const char *); + int (*vlm_Load_inner) (vlm_t *, const char *); xml_t * (*__xml_Create_inner) (vlc_object_t *); void (*xml_Delete_inner) (xml_t *); vout_synchro_t * (*__vout_SynchroInit_inner) (vlc_object_t *, int); @@ -797,27 +379,23 @@ struct module_symbols_t void (*net_ListenClose_inner) (int *fd); void (*DigestMD5_inner) (struct md5_s *, uint32_t *); int (*ACL_Check_inner) (vlc_acl_t *p_acl, const char *psz_ip); - int (*playlist_NodeRemoveParent_inner) (playlist_t *,playlist_item_t*,playlist_item_t *); + void *playlist_NodeRemoveParent_deprecated; vlc_acl_t * (*__ACL_Duplicate_inner) (vlc_object_t *p_this, const vlc_acl_t *p_acl); vlc_acl_t * (*__ACL_Create_inner) (vlc_object_t *p_this, vlc_bool_t b_allow); int (*ACL_LoadFile_inner) (vlc_acl_t *p_acl, const char *path); int (*ACL_AddNet_inner) (vlc_acl_t *p_acl, const char *psz_ip, int i_len, vlc_bool_t b_allow); void (*ACL_Destroy_inner) (vlc_acl_t *p_acl); - char* (*httpd_ServerIP_inner) (httpd_client_t *cl, char *psz_ip); + char* (*httpd_ServerIP_inner) (const httpd_client_t *cl, char *psz_ip); char * (*FromLocale_inner) (const char *); void (*LocaleFree_inner) (const char *); char * (*ToLocale_inner) (const char *); char * (*EnsureUTF8_inner) (char *); - void *vlc_fix_readdir_charset_deprecated; char * (*__vlc_fix_readdir_charset_inner) (vlc_object_t *, const char *); 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); - int (*osd_Slider_inner) (vlc_object_t *, spu_t *, int, int, int, int, short); void (*osd_ConfigUnload_inner) (vlc_object_t *, osd_menu_t **); void (*__osd_MenuShow_inner) (vlc_object_t *); - int (*osd_Icon_inner) (vlc_object_t *, spu_t *, int, int, int, short); - void *__osd_VolumeDown_deprecated; void (*__osd_MenuNext_inner) (vlc_object_t *); void (*__osd_MenuDelete_inner) (vlc_object_t *, osd_menu_t *); void (*__osd_MenuHide_inner) (vlc_object_t *); @@ -826,7 +404,6 @@ struct module_symbols_t void (*__osd_MenuDown_inner) (vlc_object_t *); osd_menu_t * (*__osd_MenuCreate_inner) (vlc_object_t *, const char *); void (*__osd_MenuPrev_inner) (vlc_object_t *); - void *__osd_VolumeUp_deprecated; void (*__osd_MenuActivate_inner) (vlc_object_t *); void (*__osd_Volume_inner) (vlc_object_t *); const char * (*VLC_Compiler_inner) (void); @@ -836,7 +413,6 @@ struct module_symbols_t const char * (*VLC_CompileDomain_inner) (void); const char * (*VLC_CompileHost_inner) (void); const char * (*VLC_Version_inner) (void); - void *VLC_CompileTime_deprecated; int (*playlist_PreparseEnqueueItem_inner) (playlist_t *, playlist_item_t *); struct dirent * (*vlc_readdir_wrapper_inner) (void *); int (*vlc_closedir_wrapper_inner) (void *); @@ -844,11 +420,127 @@ struct module_symbols_t void (*httpd_HandlerDelete_inner) (httpd_handler_t *); int (*__vlc_execve_inner) (vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data); httpd_handler_t * (*httpd_HandlerNew_inner) (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *); + int (*osd_Slider_inner) (vlc_object_t *, spu_t *, int, int, int, int, int, int, short); int (*osd_ShowTextRelative_inner) (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t); + int (*osd_Icon_inner) (vlc_object_t *, spu_t *, int, int, int, int, int, short); 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 *); + 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; + void (*intf_InteractionManage_inner) (playlist_t *); + void (*intf_InteractionDestroy_inner) (interaction_t *); + int (*__intf_UserFatal_inner) (vlc_object_t*, vlc_bool_t, const char*, const char*, ...); + int (*__intf_UserLoginPassword_inner) (vlc_object_t*, const char*, const char*, char **, char **); + int (*__intf_UserYesNo_inner) (vlc_object_t*, const char*, const char*, const char*, const char*, const char*); + void *__intf_UserProgress_deprecated; + void *__intf_UserProgressUpdate_deprecated; + void (*__intf_UserHide_inner) (vlc_object_t *, int); + void *__stats_Create_deprecated; + int (*__stats_Update_inner) (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *); + int (*__stats_Get_inner) (vlc_object_t*, counter_t *, vlc_value_t*); + void (*stats_ComputeInputStats_inner) (input_thread_t*, input_stats_t*); + void (*stats_DumpInputStats_inner) (input_stats_t *); + void (*stats_ReinitInputStats_inner) (input_stats_t *); + void *__stats_CounterGet_deprecated; + input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *); + void *stats_HandlerDestroy_deprecated; + 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); + void (*__stats_TimerStart_inner) (vlc_object_t*, const char *, unsigned int); + void (*__stats_ComputeGlobalStats_inner) (vlc_object_t*,global_stats_t*); + void (*__stats_TimerStop_inner) (vlc_object_t*, unsigned int); + void (*__stats_TimersDumpAll_inner) (vlc_object_t*); + update_iterator_t * (*update_iterator_New_inner) (update_t *); + void (*update_Check_inner) (update_t *, vlc_bool_t); + unsigned int (*update_iterator_Action_inner) (update_iterator_t *, int); + void (*update_Delete_inner) (update_t *); + void (*update_iterator_Delete_inner) (update_iterator_t *); + 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_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); + int (*utf8_stat_inner) (const char *filename, void *buf); + int (*utf8_lstat_inner) (const char *filename, void *buf); + char * (*FromLocaleDup_inner) (const char *); + int (*utf8_mkdir_inner) (const char *filename); + vlm_media_t* (*vlm_MediaSearch_inner) (vlm_t *, const char *); + int (*playlist_TreeMove_inner) (playlist_t *, playlist_item_t *, playlist_item_t *, int); + const char * (*config_GetDataDir_inner) (const vlc_object_t *); + double (*us_atof_inner) (const char *); + double (*us_strtod_inner) (const char *, char **); + lldiv_t (*vlc_lldiv_inner) (long long numer, long long denom); + void (*unescape_URI_inner) (char *psz); + 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 *); + 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 ** )); + char * (*decode_URI_duplicate_inner) (const char *psz); + void (*decode_URI_inner) (char *psz); + 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); + 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); + 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); + 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); + 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_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; + void *stats_TimersClean_deprecated; + void (*__stats_TimersClean_inner) (vlc_object_t *); + void *__intf_IntfProgressUpdate_deprecated; + void *__intf_IntfProgress_deprecated; + void *streaming_ChainToPsz_deprecated; + 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); + 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); + int (*__input_SecondaryPreparse_inner) (vlc_object_t *, input_item_t *); }; -# if defined (__PLUGIN__) +# if defined (__PLUGIN__) # define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner # define aout_FiltersDestroyPipeline (p_symbols)->aout_FiltersDestroyPipeline_inner # define aout_FiltersPlay (p_symbols)->aout_FiltersPlay_inner @@ -921,7 +613,7 @@ struct module_symbols_t # define date_Get (p_symbols)->date_Get_inner # define date_Move (p_symbols)->date_Move_inner # define date_Increment (p_symbols)->date_Increment_inner -# define __net_OpenTCP (p_symbols)->__net_OpenTCP_inner +# define __net_ConnectTCP (p_symbols)->__net_ConnectTCP_inner # define __net_ListenTCP (p_symbols)->__net_ListenTCP_inner # define __net_Accept (p_symbols)->__net_Accept_inner # define __net_OpenUDP (p_symbols)->__net_OpenUDP_inner @@ -1094,20 +786,9 @@ struct module_symbols_t # 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_ItemNew (p_symbols)->__playlist_ItemNew_inner -# define __playlist_ItemCopy (p_symbols)->__playlist_ItemCopy_inner # define playlist_ItemNewWithType (p_symbols)->playlist_ItemNewWithType_inner # define playlist_ItemDelete (p_symbols)->playlist_ItemDelete_inner -# define playlist_ItemAddParent (p_symbols)->playlist_ItemAddParent_inner -# define playlist_CopyParents (p_symbols)->playlist_CopyParents_inner # define playlist_ItemSetName (p_symbols)->playlist_ItemSetName_inner -# define playlist_ItemSetDuration (p_symbols)->playlist_ItemSetDuration_inner -# define playlist_ViewInsert (p_symbols)->playlist_ViewInsert_inner -# define playlist_ViewDelete (p_symbols)->playlist_ViewDelete_inner -# define playlist_ViewFind (p_symbols)->playlist_ViewFind_inner -# define playlist_ViewUpdate (p_symbols)->playlist_ViewUpdate_inner -# define playlist_ViewDump (p_symbols)->playlist_ViewDump_inner -# define playlist_ViewEmpty (p_symbols)->playlist_ViewEmpty_inner # define playlist_NodeCreate (p_symbols)->playlist_NodeCreate_inner # define playlist_NodeAppend (p_symbols)->playlist_NodeAppend_inner # define playlist_NodeInsert (p_symbols)->playlist_NodeInsert_inner @@ -1118,27 +799,12 @@ 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_ItemAdd (p_symbols)->playlist_ItemAdd_inner # define playlist_NodeAddItem (p_symbols)->playlist_NodeAddItem_inner -# define playlist_Delete (p_symbols)->playlist_Delete_inner # define playlist_LockDelete (p_symbols)->playlist_LockDelete_inner -# define playlist_Disable (p_symbols)->playlist_Disable_inner -# define playlist_Enable (p_symbols)->playlist_Enable_inner # define playlist_ItemToNode (p_symbols)->playlist_ItemToNode_inner # define playlist_LockItemToNode (p_symbols)->playlist_LockItemToNode_inner -# define playlist_Replace (p_symbols)->playlist_Replace_inner -# define playlist_LockReplace (p_symbols)->playlist_LockReplace_inner # define playlist_ItemGetById (p_symbols)->playlist_ItemGetById_inner -# define playlist_LockItemGetById (p_symbols)->playlist_LockItemGetById_inner -# define playlist_ItemGetByPos (p_symbols)->playlist_ItemGetByPos_inner -# define playlist_LockItemGetByPos (p_symbols)->playlist_LockItemGetByPos_inner # define playlist_ItemGetByInput (p_symbols)->playlist_ItemGetByInput_inner -# define playlist_LockItemGetByInput (p_symbols)->playlist_LockItemGetByInput_inner -# define playlist_GetPositionById (p_symbols)->playlist_GetPositionById_inner -# define playlist_ItemAddOption (p_symbols)->playlist_ItemAddOption_inner -# define playlist_Sort (p_symbols)->playlist_Sort_inner -# define playlist_Move (p_symbols)->playlist_Move_inner -# define playlist_NodeGroup (p_symbols)->playlist_NodeGroup_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 @@ -1208,7 +874,6 @@ struct module_symbols_t # define net_ListenClose (p_symbols)->net_ListenClose_inner # define DigestMD5 (p_symbols)->DigestMD5_inner # define ACL_Check (p_symbols)->ACL_Check_inner -# define playlist_NodeRemoveParent (p_symbols)->playlist_NodeRemoveParent_inner # define __ACL_Duplicate (p_symbols)->__ACL_Duplicate_inner # define __ACL_Create (p_symbols)->__ACL_Create_inner # define ACL_LoadFile (p_symbols)->ACL_LoadFile_inner @@ -1223,10 +888,8 @@ struct module_symbols_t # define vlc_scandir (p_symbols)->vlc_scandir_inner # define vlc_alphasort (p_symbols)->vlc_alphasort_inner # define __osd_StateChange (p_symbols)->__osd_StateChange_inner -# define osd_Slider (p_symbols)->osd_Slider_inner # define osd_ConfigUnload (p_symbols)->osd_ConfigUnload_inner # define __osd_MenuShow (p_symbols)->__osd_MenuShow_inner -# define osd_Icon (p_symbols)->osd_Icon_inner # define __osd_MenuNext (p_symbols)->__osd_MenuNext_inner # define __osd_MenuDelete (p_symbols)->__osd_MenuDelete_inner # define __osd_MenuHide (p_symbols)->__osd_MenuHide_inner @@ -1251,14 +914,109 @@ struct module_symbols_t # define httpd_HandlerDelete (p_symbols)->httpd_HandlerDelete_inner # define __vlc_execve (p_symbols)->__vlc_execve_inner # define httpd_HandlerNew (p_symbols)->httpd_HandlerNew_inner +# define osd_Slider (p_symbols)->osd_Slider_inner # define osd_ShowTextRelative (p_symbols)->osd_ShowTextRelative_inner +# define osd_Icon (p_symbols)->osd_Icon_inner # define osd_Message (p_symbols)->osd_Message_inner # define osd_ShowTextAbsolute (p_symbols)->osd_ShowTextAbsolute_inner -# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__) +# 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 +# define intf_InteractionDestroy (p_symbols)->intf_InteractionDestroy_inner +# define __intf_UserFatal (p_symbols)->__intf_UserFatal_inner +# define __intf_UserLoginPassword (p_symbols)->__intf_UserLoginPassword_inner +# define __intf_UserYesNo (p_symbols)->__intf_UserYesNo_inner +# define __intf_UserHide (p_symbols)->__intf_UserHide_inner +# define __stats_Update (p_symbols)->__stats_Update_inner +# define __stats_Get (p_symbols)->__stats_Get_inner +# define stats_ComputeInputStats (p_symbols)->stats_ComputeInputStats_inner +# define stats_DumpInputStats (p_symbols)->stats_DumpInputStats_inner +# define stats_ReinitInputStats (p_symbols)->stats_ReinitInputStats_inner +# define __input_CreateThread2 (p_symbols)->__input_CreateThread2_inner +# define vlc_current_object (p_symbols)->vlc_current_object_inner +# define __var_OptionParse (p_symbols)->__var_OptionParse_inner +# define __stats_TimerDump (p_symbols)->__stats_TimerDump_inner +# define __stats_TimerStart (p_symbols)->__stats_TimerStart_inner +# define __stats_ComputeGlobalStats (p_symbols)->__stats_ComputeGlobalStats_inner +# define __stats_TimerStop (p_symbols)->__stats_TimerStop_inner +# define __stats_TimersDumpAll (p_symbols)->__stats_TimersDumpAll_inner +# define update_iterator_New (p_symbols)->update_iterator_New_inner +# define update_Check (p_symbols)->update_Check_inner +# define update_iterator_Action (p_symbols)->update_iterator_Action_inner +# define update_Delete (p_symbols)->update_Delete_inner +# define update_iterator_Delete (p_symbols)->update_iterator_Delete_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 utf8_opendir (p_symbols)->utf8_opendir_inner +# define utf8_fopen (p_symbols)->utf8_fopen_inner +# define utf8_readdir (p_symbols)->utf8_readdir_inner +# define utf8_stat (p_symbols)->utf8_stat_inner +# define utf8_lstat (p_symbols)->utf8_lstat_inner +# define FromLocaleDup (p_symbols)->FromLocaleDup_inner +# define utf8_mkdir (p_symbols)->utf8_mkdir_inner +# define vlm_MediaSearch (p_symbols)->vlm_MediaSearch_inner +# define playlist_TreeMove (p_symbols)->playlist_TreeMove_inner +# define config_GetDataDir (p_symbols)->config_GetDataDir_inner +# define us_atof (p_symbols)->us_atof_inner +# define us_strtod (p_symbols)->us_strtod_inner +# define vlc_lldiv (p_symbols)->vlc_lldiv_inner +# define unescape_URI (p_symbols)->unescape_URI_inner +# 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 +# define decode_URI_duplicate (p_symbols)->decode_URI_duplicate_inner +# define decode_URI (p_symbols)->decode_URI_inner +# define encode_URI_component (p_symbols)->encode_URI_component_inner +# define vlc_strlcpy (p_symbols)->vlc_strlcpy_inner +# define __input_ItemNewExt (p_symbols)->__input_ItemNewExt_inner +# define input_ItemNewWithType (p_symbols)->input_ItemNewWithType_inner +# define playlist_NodeAddInput (p_symbols)->playlist_NodeAddInput_inner +# define playlist_BothAddInput (p_symbols)->playlist_BothAddInput_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_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 __intf_UserWarn (p_symbols)->__intf_UserWarn_inner +# define __intf_UserProgressIsCancelled (p_symbols)->__intf_UserProgressIsCancelled_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_SecondaryPreparse (p_symbols)->__input_SecondaryPreparse_inner +# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__) /****************************************************************** * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access. ******************************************************************/ -# define STORE_SYMBOLS( p_symbols ) \ +# define STORE_SYMBOLS( p_symbols ) \ ((p_symbols)->aout_FiltersCreatePipeline_inner) = aout_FiltersCreatePipeline; \ ((p_symbols)->aout_FiltersDestroyPipeline_inner) = aout_FiltersDestroyPipeline; \ ((p_symbols)->aout_FiltersPlay_inner) = aout_FiltersPlay; \ @@ -1331,7 +1089,7 @@ struct module_symbols_t ((p_symbols)->date_Get_inner) = date_Get; \ ((p_symbols)->date_Move_inner) = date_Move; \ ((p_symbols)->date_Increment_inner) = date_Increment; \ - ((p_symbols)->__net_OpenTCP_inner) = __net_OpenTCP; \ + ((p_symbols)->__net_ConnectTCP_inner) = __net_ConnectTCP; \ ((p_symbols)->__net_ListenTCP_inner) = __net_ListenTCP; \ ((p_symbols)->__net_Accept_inner) = __net_Accept; \ ((p_symbols)->__net_OpenUDP_inner) = __net_OpenUDP; \ @@ -1504,20 +1262,9 @@ struct module_symbols_t ((p_symbols)->playlist_ServicesDiscoveryRemove_inner) = playlist_ServicesDiscoveryRemove; \ ((p_symbols)->playlist_AddSDModules_inner) = playlist_AddSDModules; \ ((p_symbols)->playlist_IsServicesDiscoveryLoaded_inner) = playlist_IsServicesDiscoveryLoaded; \ - ((p_symbols)->__playlist_ItemNew_inner) = __playlist_ItemNew; \ - ((p_symbols)->__playlist_ItemCopy_inner) = __playlist_ItemCopy; \ ((p_symbols)->playlist_ItemNewWithType_inner) = playlist_ItemNewWithType; \ ((p_symbols)->playlist_ItemDelete_inner) = playlist_ItemDelete; \ - ((p_symbols)->playlist_ItemAddParent_inner) = playlist_ItemAddParent; \ - ((p_symbols)->playlist_CopyParents_inner) = playlist_CopyParents; \ ((p_symbols)->playlist_ItemSetName_inner) = playlist_ItemSetName; \ - ((p_symbols)->playlist_ItemSetDuration_inner) = playlist_ItemSetDuration; \ - ((p_symbols)->playlist_ViewInsert_inner) = playlist_ViewInsert; \ - ((p_symbols)->playlist_ViewDelete_inner) = playlist_ViewDelete; \ - ((p_symbols)->playlist_ViewFind_inner) = playlist_ViewFind; \ - ((p_symbols)->playlist_ViewUpdate_inner) = playlist_ViewUpdate; \ - ((p_symbols)->playlist_ViewDump_inner) = playlist_ViewDump; \ - ((p_symbols)->playlist_ViewEmpty_inner) = playlist_ViewEmpty; \ ((p_symbols)->playlist_NodeCreate_inner) = playlist_NodeCreate; \ ((p_symbols)->playlist_NodeAppend_inner) = playlist_NodeAppend; \ ((p_symbols)->playlist_NodeInsert_inner) = playlist_NodeInsert; \ @@ -1528,27 +1275,12 @@ 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_ItemAdd_inner) = playlist_ItemAdd; \ ((p_symbols)->playlist_NodeAddItem_inner) = playlist_NodeAddItem; \ - ((p_symbols)->playlist_Delete_inner) = playlist_Delete; \ ((p_symbols)->playlist_LockDelete_inner) = playlist_LockDelete; \ - ((p_symbols)->playlist_Disable_inner) = playlist_Disable; \ - ((p_symbols)->playlist_Enable_inner) = playlist_Enable; \ ((p_symbols)->playlist_ItemToNode_inner) = playlist_ItemToNode; \ ((p_symbols)->playlist_LockItemToNode_inner) = playlist_LockItemToNode; \ - ((p_symbols)->playlist_Replace_inner) = playlist_Replace; \ - ((p_symbols)->playlist_LockReplace_inner) = playlist_LockReplace; \ ((p_symbols)->playlist_ItemGetById_inner) = playlist_ItemGetById; \ - ((p_symbols)->playlist_LockItemGetById_inner) = playlist_LockItemGetById; \ - ((p_symbols)->playlist_ItemGetByPos_inner) = playlist_ItemGetByPos; \ - ((p_symbols)->playlist_LockItemGetByPos_inner) = playlist_LockItemGetByPos; \ ((p_symbols)->playlist_ItemGetByInput_inner) = playlist_ItemGetByInput; \ - ((p_symbols)->playlist_LockItemGetByInput_inner) = playlist_LockItemGetByInput; \ - ((p_symbols)->playlist_GetPositionById_inner) = playlist_GetPositionById; \ - ((p_symbols)->playlist_ItemAddOption_inner) = playlist_ItemAddOption; \ - ((p_symbols)->playlist_Sort_inner) = playlist_Sort; \ - ((p_symbols)->playlist_Move_inner) = playlist_Move; \ - ((p_symbols)->playlist_NodeGroup_inner) = playlist_NodeGroup; \ ((p_symbols)->playlist_NodeSort_inner) = playlist_NodeSort; \ ((p_symbols)->playlist_RecursiveNodeSort_inner) = playlist_RecursiveNodeSort; \ ((p_symbols)->playlist_Import_inner) = playlist_Import; \ @@ -1618,7 +1350,6 @@ struct module_symbols_t ((p_symbols)->net_ListenClose_inner) = net_ListenClose; \ ((p_symbols)->DigestMD5_inner) = DigestMD5; \ ((p_symbols)->ACL_Check_inner) = ACL_Check; \ - ((p_symbols)->playlist_NodeRemoveParent_inner) = playlist_NodeRemoveParent; \ ((p_symbols)->__ACL_Duplicate_inner) = __ACL_Duplicate; \ ((p_symbols)->__ACL_Create_inner) = __ACL_Create; \ ((p_symbols)->ACL_LoadFile_inner) = ACL_LoadFile; \ @@ -1633,10 +1364,8 @@ struct module_symbols_t ((p_symbols)->vlc_scandir_inner) = vlc_scandir; \ ((p_symbols)->vlc_alphasort_inner) = vlc_alphasort; \ ((p_symbols)->__osd_StateChange_inner) = __osd_StateChange; \ - ((p_symbols)->osd_Slider_inner) = osd_Slider; \ ((p_symbols)->osd_ConfigUnload_inner) = osd_ConfigUnload; \ ((p_symbols)->__osd_MenuShow_inner) = __osd_MenuShow; \ - ((p_symbols)->osd_Icon_inner) = osd_Icon; \ ((p_symbols)->__osd_MenuNext_inner) = __osd_MenuNext; \ ((p_symbols)->__osd_MenuDelete_inner) = __osd_MenuDelete; \ ((p_symbols)->__osd_MenuHide_inner) = __osd_MenuHide; \ @@ -1661,15 +1390,153 @@ struct module_symbols_t ((p_symbols)->httpd_HandlerDelete_inner) = httpd_HandlerDelete; \ ((p_symbols)->__vlc_execve_inner) = __vlc_execve; \ ((p_symbols)->httpd_HandlerNew_inner) = httpd_HandlerNew; \ + ((p_symbols)->osd_Slider_inner) = osd_Slider; \ ((p_symbols)->osd_ShowTextRelative_inner) = osd_ShowTextRelative; \ + ((p_symbols)->osd_Icon_inner) = osd_Icon; \ ((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; \ + ((p_symbols)->intf_InteractionDestroy_inner) = intf_InteractionDestroy; \ + ((p_symbols)->__intf_UserFatal_inner) = __intf_UserFatal; \ + ((p_symbols)->__intf_UserLoginPassword_inner) = __intf_UserLoginPassword; \ + ((p_symbols)->__intf_UserYesNo_inner) = __intf_UserYesNo; \ + ((p_symbols)->__intf_UserHide_inner) = __intf_UserHide; \ + ((p_symbols)->__stats_Update_inner) = __stats_Update; \ + ((p_symbols)->__stats_Get_inner) = __stats_Get; \ + ((p_symbols)->stats_ComputeInputStats_inner) = stats_ComputeInputStats; \ + ((p_symbols)->stats_DumpInputStats_inner) = stats_DumpInputStats; \ + ((p_symbols)->stats_ReinitInputStats_inner) = stats_ReinitInputStats; \ + ((p_symbols)->__input_CreateThread2_inner) = __input_CreateThread2; \ + ((p_symbols)->vlc_current_object_inner) = vlc_current_object; \ + ((p_symbols)->__var_OptionParse_inner) = __var_OptionParse; \ + ((p_symbols)->__stats_TimerDump_inner) = __stats_TimerDump; \ + ((p_symbols)->__stats_TimerStart_inner) = __stats_TimerStart; \ + ((p_symbols)->__stats_ComputeGlobalStats_inner) = __stats_ComputeGlobalStats; \ + ((p_symbols)->__stats_TimerStop_inner) = __stats_TimerStop; \ + ((p_symbols)->__stats_TimersDumpAll_inner) = __stats_TimersDumpAll; \ + ((p_symbols)->update_iterator_New_inner) = update_iterator_New; \ + ((p_symbols)->update_Check_inner) = update_Check; \ + ((p_symbols)->update_iterator_Action_inner) = update_iterator_Action; \ + ((p_symbols)->update_Delete_inner) = update_Delete; \ + ((p_symbols)->update_iterator_Delete_inner) = update_iterator_Delete; \ + ((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)->utf8_opendir_inner) = utf8_opendir; \ + ((p_symbols)->utf8_fopen_inner) = utf8_fopen; \ + ((p_symbols)->utf8_readdir_inner) = utf8_readdir; \ + ((p_symbols)->utf8_stat_inner) = utf8_stat; \ + ((p_symbols)->utf8_lstat_inner) = utf8_lstat; \ + ((p_symbols)->FromLocaleDup_inner) = FromLocaleDup; \ + ((p_symbols)->utf8_mkdir_inner) = utf8_mkdir; \ + ((p_symbols)->vlm_MediaSearch_inner) = vlm_MediaSearch; \ + ((p_symbols)->playlist_TreeMove_inner) = playlist_TreeMove; \ + ((p_symbols)->config_GetDataDir_inner) = config_GetDataDir; \ + ((p_symbols)->us_atof_inner) = us_atof; \ + ((p_symbols)->us_strtod_inner) = us_strtod; \ + ((p_symbols)->vlc_lldiv_inner) = vlc_lldiv; \ + ((p_symbols)->unescape_URI_inner) = unescape_URI; \ + ((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; \ + ((p_symbols)->decode_URI_duplicate_inner) = decode_URI_duplicate; \ + ((p_symbols)->decode_URI_inner) = decode_URI; \ + ((p_symbols)->encode_URI_component_inner) = encode_URI_component; \ + ((p_symbols)->vlc_strlcpy_inner) = vlc_strlcpy; \ + ((p_symbols)->__input_ItemNewExt_inner) = __input_ItemNewExt; \ + ((p_symbols)->input_ItemNewWithType_inner) = input_ItemNewWithType; \ + ((p_symbols)->playlist_NodeAddInput_inner) = playlist_NodeAddInput; \ + ((p_symbols)->playlist_BothAddInput_inner) = playlist_BothAddInput; \ + ((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_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)->__intf_UserWarn_inner) = __intf_UserWarn; \ + ((p_symbols)->__intf_UserProgressIsCancelled_inner) = __intf_UserProgressIsCancelled; \ + ((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_SecondaryPreparse_inner) = __input_SecondaryPreparse; \ (p_symbols)->net_ConvertIPv4_deprecated = NULL; \ - (p_symbols)->vlc_fix_readdir_charset_deprecated = NULL; \ - (p_symbols)->__osd_VolumeDown_deprecated = NULL; \ - (p_symbols)->__osd_VolumeUp_deprecated = NULL; \ - (p_symbols)->VLC_CompileTime_deprecated = NULL; \ + (p_symbols)->__playlist_ItemNew_deprecated = NULL; \ + (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \ + (p_symbols)->playlist_ItemAddParent_deprecated = NULL; \ + (p_symbols)->playlist_CopyParents_deprecated = NULL; \ + (p_symbols)->playlist_ItemSetDuration_deprecated = NULL; \ + (p_symbols)->playlist_ViewInsert_deprecated = NULL; \ + (p_symbols)->playlist_ViewDelete_deprecated = NULL; \ + (p_symbols)->playlist_ViewFind_deprecated = NULL; \ + (p_symbols)->playlist_ViewUpdate_deprecated = NULL; \ + (p_symbols)->playlist_ViewDump_deprecated = NULL; \ + (p_symbols)->playlist_ViewEmpty_deprecated = NULL; \ + (p_symbols)->playlist_ItemAdd_deprecated = NULL; \ + (p_symbols)->playlist_Delete_deprecated = NULL; \ + (p_symbols)->playlist_Disable_deprecated = NULL; \ + (p_symbols)->playlist_Enable_deprecated = NULL; \ + (p_symbols)->playlist_Replace_deprecated = NULL; \ + (p_symbols)->playlist_LockReplace_deprecated = NULL; \ + (p_symbols)->playlist_LockItemGetById_deprecated = NULL; \ + (p_symbols)->playlist_ItemGetByPos_deprecated = NULL; \ + (p_symbols)->playlist_LockItemGetByPos_deprecated = NULL; \ + (p_symbols)->playlist_LockItemGetByInput_deprecated = NULL; \ + (p_symbols)->playlist_GetPositionById_deprecated = NULL; \ + (p_symbols)->playlist_ItemAddOption_deprecated = NULL; \ + (p_symbols)->playlist_Sort_deprecated = NULL; \ + (p_symbols)->playlist_Move_deprecated = NULL; \ + (p_symbols)->playlist_NodeGroup_deprecated = NULL; \ + (p_symbols)->playlist_NodeRemoveParent_deprecated = NULL; \ + (p_symbols)->__intf_Interact_deprecated = NULL; \ + (p_symbols)->__intf_UserProgress_deprecated = NULL; \ + (p_symbols)->__intf_UserProgressUpdate_deprecated = NULL; \ + (p_symbols)->__stats_Create_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)->__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; \ -# endif /* __PLUGIN__ */ -# endif /* HAVE_SHARED_LIBVLC */ +# endif /* __PLUGIN__ */ #endif /* __VLC_SYMBOLS_H */