A bit of vlc/libvlc cleanup:

[vlc] / include / vlc_strings.h

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 8c16a21290dd356387ba43adb17be8e6ea4b9515..a7468746d49429b0f34154970a7224c645c15894 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -21,6 +21,10 @@
  * 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
 
@@ -34,37 +38,9 @@
 VLC_EXPORT( void, resolve_xml_special_chars, ( char *psz_value ) );
 VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
 
-struct localized_string_t 
-{
-    char *psz_lang;
-    char *psz_text;
-};
-
-struct i18n_string_t
-{
-    int i_langs;
-    localized_string_t **pp_langs;
-};
-
-static inline void i18n_AddLang( i18n_string_t *p_src,
-                                 char *psz_lang, char *psz_text )
-{
-    DECMALLOC_VOID( pl10n, localized_string_t );
-    pl10n->psz_lang = strdup( psz_lang );
-    pl10n->psz_text = strdup( psz_text );
-    INSERT_ELEM( p_src->pp_langs, p_src->i_langs, p_src->i_langs, pl10n );
-};
-
-static inline char *i18n_Get( i18n_string_t *p_src, char *psz_lang )
-{
-    int i;
-    for( i = 0 ; i < p_src->i_langs; i++ )
-    {
-        if( !strcmp( p_src->pp_langs[i]->psz_lang, psz_lang ) )
-            return p_src->pp_langs[i]->psz_text;
-    }
-    return strdup( "" );
-};
+VLC_EXPORT( char *, str_format_time, ( char * ) );
+#define str_format_meta( a, b ) __str_format_meta( VLC_OBJECT( a ), b )
+VLC_EXPORT( char *, __str_format_meta, ( vlc_object_t *, char * ) );
 
 /**
  * @}