Restores [13132] back - break the new interface again

[vlc] / include / vlc_symbols.h

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index 4b201ca600fa277dcfebaefc20c429fb8a368bf5..a9b95722c87197cc919d6417ccc1305f8f00aa8a 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -420,9 +420,9 @@ 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, short);
+    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, short);
+    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);
@@ -480,11 +480,17 @@ struct module_symbols_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 (*decode_encoded_URI_inner) (char *psz);
+    void (*unescape_URI_inner) (char *psz);
     char * (*convert_xml_special_chars_inner) (const char *psz_content);
-    char * (*decode_encoded_URI_duplicate_inner) (const char *psz);
+    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);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -945,11 +951,17 @@ struct module_symbols_t
 #  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 decode_encoded_URI (p_symbols)->decode_encoded_URI_inner
+#  define unescape_URI (p_symbols)->unescape_URI_inner
 #  define convert_xml_special_chars (p_symbols)->convert_xml_special_chars_inner
-#  define decode_encoded_URI_duplicate (p_symbols)->decode_encoded_URI_duplicate_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
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1413,11 +1425,17 @@ struct module_symbols_t
     ((p_symbols)->us_atof_inner) = us_atof; \
     ((p_symbols)->us_strtod_inner) = us_strtod; \
     ((p_symbols)->vlc_lldiv_inner) = vlc_lldiv; \
-    ((p_symbols)->decode_encoded_URI_inner) = decode_encoded_URI; \
+    ((p_symbols)->unescape_URI_inner) = unescape_URI; \
     ((p_symbols)->convert_xml_special_chars_inner) = convert_xml_special_chars; \
-    ((p_symbols)->decode_encoded_URI_duplicate_inner) = decode_encoded_URI_duplicate; \
+    ((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)->net_ConvertIPv4_deprecated = NULL; \
     (p_symbols)->__stats_CounterGet_deprecated = NULL; \
     (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \