Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_strings.h

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index cc833a5b31905e39b4ed4c22a327797b6faae2c7..42304257dd97a2a1e608691298e2396fceda7de2 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -21,14 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
-#ifndef _VLC_STRINGS_H
-#define _VLC_STRINGS_H 1
+#ifndef VLC_STRINGS_H
+#define VLC_STRINGS_H 1
 
-#include <vlc/vlc.h>
+/**
+ * \file
+ * This file defines functions and structures handling misc strings
+ */
 
 /**
  * \defgroup strings Strings
@@ -41,11 +40,15 @@ VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
 VLC_EXPORT( char *, vlc_b64_encode_binary, ( const uint8_t *, size_t ) );
 VLC_EXPORT( char *, vlc_b64_encode, ( const char * ) );
 
+VLC_EXPORT( size_t, vlc_b64_decode_binary_to_buffer, ( uint8_t *p_dst, size_t i_dst_max, const char *psz_src ) );
+VLC_EXPORT( size_t, vlc_b64_decode_binary, ( uint8_t **pp_dst, const char *psz_src ) );
+VLC_EXPORT( char *, vlc_b64_decode, ( const char *psz_src ) );
+
 VLC_EXPORT( char *, str_format_time, ( const char * ) );
-#define str_format_meta( a, b ) __str_format_meta( VLC_OBJECT( a ), b )
-VLC_EXPORT( char *, __str_format_meta, ( vlc_object_t *, const char * ) );
-#define str_format( a, b ) __str_format( VLC_OBJECT( a ), b )
-VLC_EXPORT( char *, __str_format, ( vlc_object_t *, const char * ) );
+VLC_EXPORT( char *, str_format_meta, ( vlc_object_t *, const char * ) );
+#define str_format_meta( a, b ) str_format_meta( VLC_OBJECT( a ), b )
+VLC_EXPORT( char *, str_format, ( vlc_object_t *, const char * ) );
+#define str_format( a, b ) str_format( VLC_OBJECT( a ), b )
 
 VLC_EXPORT( void, filename_sanitize, ( char * ) );
 VLC_EXPORT( void, path_sanitize, ( char * ) );