For consistency, remove references to vlc from libvlc

[vlc] / include / vlc_symbols.h

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 3f5e8474eabfa11fdf8cf09ac7564aac4693debc..e518afffa99f5f2ab585fd82cd1568e589d7072c 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -97,13 +97,13 @@ struct module_symbols_t
     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 *, ...);
@@ -447,7 +447,7 @@ struct module_symbols_t
     void *__stats_CounterGet_deprecated;
     input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
     void *stats_HandlerDestroy_deprecated;
-    vlc_t * (*vlc_current_object_inner) (int);
+    libvlc_int_t * (*vlc_current_object_inner) (int);
     void (*__var_OptionParse_inner) (vlc_object_t *, const char *);
     void *__stats_TimerDumpAll_deprecated;
     void (*__stats_TimerDump_inner) (vlc_object_t*, unsigned int);
@@ -511,7 +511,7 @@ struct module_symbols_t
     void (*playlist_NodeDump_inner) (playlist_t *p_playlist, playlist_item_t *p_item, int i_level);
     void *__intf_UserOkayCancel_deprecated;
     int (*__intf_UserStringInput_inner) (vlc_object_t*, const char*, const char*, char **);
-    void (*playlist_NodesCreateForSD_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **);
+    void *playlist_NodesCreateForSD_deprecated;
     vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
     counter_t * (*__stats_CounterCreate_inner) (vlc_object_t*, int, int);
     void *stats_TimerClean_deprecated;
@@ -533,6 +533,10 @@ struct module_symbols_t
     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);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -984,7 +988,6 @@ struct module_symbols_t
 #  define playlist_DeleteFromItemId (p_symbols)->playlist_DeleteFromItemId_inner
 #  define playlist_NodeDump (p_symbols)->playlist_NodeDump_inner
 #  define __intf_UserStringInput (p_symbols)->__intf_UserStringInput_inner
-#  define playlist_NodesCreateForSD (p_symbols)->playlist_NodesCreateForSD_inner
 #  define input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
 #  define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
 #  define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
@@ -1001,6 +1004,10 @@ struct module_symbols_t
 #  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
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1455,7 +1462,6 @@ struct module_symbols_t
     ((p_symbols)->playlist_DeleteFromItemId_inner) = playlist_DeleteFromItemId; \
     ((p_symbols)->playlist_NodeDump_inner) = playlist_NodeDump; \
     ((p_symbols)->__intf_UserStringInput_inner) = __intf_UserStringInput; \
-    ((p_symbols)->playlist_NodesCreateForSD_inner) = playlist_NodesCreateForSD; \
     ((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
     ((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
     ((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
@@ -1472,6 +1478,10 @@ struct module_symbols_t
     ((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)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
     (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
@@ -1515,6 +1525,7 @@ struct module_symbols_t
     (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; \