Stop using strings to index stats, use integers. The list is not sorted yet, though

[vlc] / include / vlc_symbols.h

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 97f7c433cf26a7130051b0ea7e061d7a02d007f6..079c2f9cc42c0cac341b5553ad77ff28e6da81cb 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -21,6 +21,7 @@ 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 *, const char *, const char *);
+input_thread_t * __input_CreateThread2 (vlc_object_t *, input_item_t *, 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 *);
@@ -54,6 +55,7 @@ int __vout_AllocatePicture (vlc_object_t *p_this, picture_t *p_pic, uint32_t i_c
 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*);
+void __var_OptionParse (vlc_object_t *, const char *);
 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 *);
@@ -63,7 +65,7 @@ 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);
-int __stats_Create (vlc_object_t*, char *, int, int);
+int __stats_Create (vlc_object_t*, const char *, unsigned int, int, int);
 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 *, const char *, int);
@@ -82,6 +84,7 @@ void __intf_UserHide (vlc_object_t *, int);
 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 *);
+update_iterator_t * update_iterator_New (update_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 *);
@@ -89,6 +92,7 @@ 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);
+void update_Check (update_t *, vlc_bool_t);
 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 *);
@@ -120,8 +124,8 @@ 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);
-int __stats_Update (vlc_object_t*, char *, vlc_value_t);
-int __stats_Get (vlc_object_t*, int, char *, vlc_value_t*);
+int __stats_Update (vlc_object_t*, unsigned int, vlc_value_t, vlc_value_t *);
+int __stats_Get (vlc_object_t*, int, int, vlc_value_t*);
 char* httpd_ClientIP (httpd_client_t *cl, char *psz_ip);
 int __intf_UserProgress (vlc_object_t*, const char*, const char*, float);
 void httpd_FileDelete (httpd_file_t *);
@@ -134,6 +138,8 @@ 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);
+unsigned int update_iterator_Action (update_iterator_t *, int);
+void __stats_TimerDump (vlc_object_t*, unsigned int);
 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);
@@ -145,6 +151,7 @@ int vlc_getnameinfo (const struct sockaddr *, int, char *, int, int *, int);
 int vlm_ExecuteCommand (vlm_t *, const char *, vlm_message_t **);
 char * config_GetUserDir (void);
 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);
+counter_t* __stats_CounterGet (vlc_object_t*, int, unsigned int);
 int __config_GetType (vlc_object_t *, const char *);
 void __vlc_thread_ready (vlc_object_t *);
 int playlist_Export (playlist_t *, const char *, const char *);
@@ -157,6 +164,7 @@ int httpd_UrlCatch (httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_s
 void __vlc_object_yield (vlc_object_t *);
 const char * VLC_CompileBy (void);
 playlist_item_t * playlist_LockItemGetByPos (playlist_t *, int);
+void update_Delete (update_t *);
 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);
@@ -198,6 +206,7 @@ int vlm_Save (vlm_t *, const 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 *);
+void __stats_TimerStart (vlc_object_t*, const char *, int);
 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);
@@ -211,9 +220,11 @@ void __intf_UserProgressUpdate (vlc_object_t*, int, const char*, float);
 void __msg_Generic (vlc_object_t *, int, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 5, 6);
 int vlc_closedir_wrapper (void *);
 int playlist_ServicesDiscoveryAdd (playlist_t *, const char *);
+void __stats_ComputeGlobalStats (vlc_object_t*,global_stats_t*);
 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 *);
+void update_iterator_Delete (update_iterator_t *);
 playlist_item_t * playlist_ItemGetById (playlist_t *, int);
 const char * vlc_gai_strerror (int);
 void net_ListenClose (int *fd);
@@ -277,12 +288,13 @@ 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 *);
 int __input_Read (vlc_object_t *, input_item_t *, vlc_bool_t);
-intf_thread_t * __intf_Create (vlc_object_t *, const char *);
+intf_thread_t * __intf_Create (vlc_object_t *, const char *, int, 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*);
+vlc_t * vlc_current_object (int);
 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 *);
@@ -296,6 +308,7 @@ 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 *);
+void vlc_HashInsert (hashtable_entry_t **, int *, int, const char *, void *);
 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 *, ...);
@@ -304,6 +317,7 @@ 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 *);
+int vlc_HashLookup (hashtable_entry_t *, int, int, const char *);
 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);
@@ -326,6 +340,7 @@ 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 *);
+void stats_HandlerDestroy (stats_handler_t*);
 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 *);
@@ -337,6 +352,7 @@ 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 *);
+unsigned int update_iterator_ChooseMirrorAndFile (update_iterator_t *, int, int, int);
 void intf_InteractionManage (playlist_t *);
 char * mstrtime (char *psz_buffer, mtime_t date);
 void aout_FormatPrepare (audio_sample_format_t * p_format);
@@ -345,9 +361,11 @@ int intf_RunThread (intf_thread_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);
 xml_t * __xml_Create (vlc_object_t *);
+void* vlc_HashRetrieve (hashtable_entry_t*, int, int, const char *);
 msg_subscription_t* __msg_Subscribe (vlc_object_t *, int);
 const char * VLC_Version (void);
 session_descriptor_t* sout_AnnounceRegisterSDP (sout_instance_t *,const char *, const char *, announce_method_t*);
+update_t * __update_New (vlc_object_t *);
 char * stream_ReadLine (stream_t *);
 int playlist_PreparseEnqueueItem (playlist_t *, playlist_item_t *);
 void __osd_MenuPrev (vlc_object_t *);
@@ -356,6 +374,7 @@ 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 *);
+void update_download (update_iterator_t *, char *);
 int playlist_ItemAddOption (playlist_item_t *, const char *);
 void aout_VolumeNoneInit (aout_instance_t *);
 void aout_DateInit (audio_date_t *, uint32_t);
@@ -365,6 +384,7 @@ 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 *, const char *, const char *, const char *);
+void __stats_TimersDumpAll (vlc_object_t*);
 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);
@@ -405,6 +425,7 @@ void aout_FormatsPrint (aout_instance_t * p_aout, const char * psz_text, const a
 char * FromUTF32 (const wchar_t *);
 void __vout_OSDMessage (vlc_object_t *, int, char *, ...);
 void intf_StopThread (intf_thread_t *);
+void __stats_TimerStop (vlc_object_t*, unsigned int);
 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 *);
@@ -671,7 +692,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 *);
+    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 *);
@@ -875,12 +896,35 @@ struct module_symbols_t
     int (*__intf_UserProgress_inner) (vlc_object_t*, const char*, const char*, float);
     void (*__intf_UserProgressUpdate_inner) (vlc_object_t*, int, const char*, float);
     void (*__intf_UserHide_inner) (vlc_object_t *, int);
-    int (*__stats_Create_inner) (vlc_object_t*, char *, int, int);
-    int (*__stats_Update_inner) (vlc_object_t*, char *, vlc_value_t);
-    int (*__stats_Get_inner) (vlc_object_t*, int, char *, vlc_value_t*);
+    int (*__stats_Create_inner) (vlc_object_t*, const char *, unsigned int, int, int);
+    int (*__stats_Update_inner) (vlc_object_t*, unsigned int, vlc_value_t, vlc_value_t *);
+    int (*__stats_Get_inner) (vlc_object_t*, int, int, 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 *);
+    counter_t* (*__stats_CounterGet_inner) (vlc_object_t*, int, unsigned int);
+    void *__stats_CounterGet_deprecated;
+    input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
+    void (*stats_HandlerDestroy_inner) (stats_handler_t*);
+    vlc_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 *, 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_inner) (hashtable_entry_t **, int *, int, const char *, void *);
+    int (*vlc_HashLookup_inner) (hashtable_entry_t *, int, int, const char *);
+    void* (*vlc_HashRetrieve_inner) (hashtable_entry_t*, int, int, const char *);
 };
 #  if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -1307,6 +1351,27 @@ struct module_symbols_t
 #  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 __stats_CounterGet (p_symbols)->__stats_CounterGet_inner
+#  define __input_CreateThread2 (p_symbols)->__input_CreateThread2_inner
+#  define stats_HandlerDestroy (p_symbols)->stats_HandlerDestroy_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 vlc_HashInsert (p_symbols)->vlc_HashInsert_inner
+#  define vlc_HashLookup (p_symbols)->vlc_HashLookup_inner
+#  define vlc_HashRetrieve (p_symbols)->vlc_HashRetrieve_inner
 #  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1736,7 +1801,30 @@ struct module_symbols_t
     ((p_symbols)->stats_ComputeInputStats_inner) = stats_ComputeInputStats; \
     ((p_symbols)->stats_DumpInputStats_inner) = stats_DumpInputStats; \
     ((p_symbols)->stats_ReinitInputStats_inner) = stats_ReinitInputStats; \
+    ((p_symbols)->__stats_CounterGet_inner) = __stats_CounterGet; \
+    ((p_symbols)->__input_CreateThread2_inner) = __input_CreateThread2; \
+    ((p_symbols)->stats_HandlerDestroy_inner) = stats_HandlerDestroy; \
+    ((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)->vlc_HashInsert_inner) = vlc_HashInsert; \
+    ((p_symbols)->vlc_HashLookup_inner) = vlc_HashLookup; \
+    ((p_symbols)->vlc_HashRetrieve_inner) = vlc_HashRetrieve; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
+    (p_symbols)->__stats_CounterGet_deprecated = NULL; \
+    (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \
 
 #  endif /* __PLUGIN__ */
 # endif /* HAVE_SHARED_LIBVLC */