Remove picture qtype support code

[vlc] / include / vlc_strings.h

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 9b67318872d79dfcb8746c638b353bf837fc4439..91592826f20551b2a5cf6f661ad437acded65d0d 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -1,53 +1,64 @@
 /*****************************************************************************
  * vlc_strings.h: String functions
  *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan dot org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software 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
  * @{
  */
 
-VLC_EXPORT( void, resolve_xml_special_chars, ( char *psz_value ) );
-VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
+VLC_API void resolve_xml_special_chars( char *psz_value );
+VLC_API char * convert_xml_special_chars( const char *psz_content );
+
+VLC_API char * vlc_b64_encode_binary( const uint8_t *, size_t );
+VLC_API char * vlc_b64_encode( const char * );
+
+VLC_API size_t vlc_b64_decode_binary_to_buffer( uint8_t *p_dst, size_t i_dst_max, const char *psz_src );
+VLC_API size_t vlc_b64_decode_binary( uint8_t **pp_dst, const char *psz_src );
+VLC_API char * vlc_b64_decode( const char *psz_src );
+
+VLC_API char * str_format_time( const char * );
+VLC_API char * str_format_meta( playlist_t *, const char * );
 
-VLC_EXPORT( char *, vlc_b64_encode, ( const char * ) );
+static inline char *str_format( playlist_t *pl, const char *fmt )
+{
+    char *s1 = str_format_time( fmt );
+    char *s2 = str_format_meta( pl, s1 );
+    free( s1 );
+    return s2;
+}
 
-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_API void filename_sanitize( char * );
+VLC_API void path_sanitize( char * );
 
-VLC_EXPORT( void, filename_sanitize, ( char * ) );
-VLC_EXPORT( void, path_sanitize, ( char * ) );
+VLC_API time_t str_duration( const char * );
 
 /**
  * @}