decoder: add input_DecoderFlush()

[vlc] / include / vlc_strings.h

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 92e43a266c0f5b1b4ebc6519ee4bcdbb36536ec1..2170c240eb2135e9b7e9641d32795e10d104edc0 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -34,6 +34,63 @@
  * @{
  */
 
+static inline int vlc_ascii_toupper( int c )
+{
+    if ( c >= 'a' && c <= 'z' )
+        return c + ( 'A' - 'a' );
+    else
+        return c;
+}
+
+static inline int vlc_ascii_tolower( int c )
+{
+    if ( c >= 'A' && c <= 'Z' )
+        return c + ( 'a' - 'A' );
+    else
+        return c;
+}
+
+/**
+ * Compare two ASCII strings ignoring case.
+ *
+ * The result is independent of the locale. If there are non-ASCII
+ * characters in the strings, their cases are NOT ignored in the
+ * comparison.
+ */
+static inline int vlc_ascii_strcasecmp( const char *psz1, const char *psz2 )
+{
+    const char *s1 = psz1;
+    const char *s2 = psz2;
+    int d = vlc_ascii_tolower( *s1 ) - vlc_ascii_tolower( *s2 );
+    while ( *s1 && d == 0)
+    {
+        s1++;
+        s2++;
+        d = vlc_ascii_tolower( *s1 ) - vlc_ascii_tolower( *s2 );
+    }
+
+    return d;
+}
+
+static inline int vlc_ascii_strncasecmp( const char *psz1, const char *psz2, size_t n )
+{
+    const char *s1 = psz1;
+    const char *s2 = psz2;
+    const char *s1end = psz1 + n;
+    int d = vlc_ascii_tolower( *s1 ) - vlc_ascii_tolower( *s2 );
+    while ( *s1 && s1 < s1end && d == 0)
+    {
+        s1++;
+        s2++;
+        d = vlc_ascii_tolower( *s1 ) - vlc_ascii_tolower( *s2 );
+    }
+
+    if (s1 == s1end)
+        return 0;
+    else
+        return d;
+}
+
 VLC_API void resolve_xml_special_chars( char *psz_value );
 VLC_API char * convert_xml_special_chars( const char *psz_content );
 
@@ -45,14 +102,21 @@ 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( vlc_object_t *, const char * );
-#define str_format_meta( a, b ) str_format_meta( VLC_OBJECT( a ), b )
-VLC_API char * str_format( vlc_object_t *, const char * );
-#define str_format( a, b ) str_format( VLC_OBJECT( a ), b )
+VLC_API char * str_format_meta( input_thread_t *, const char * );
+
+static inline char *str_format( input_thread_t *input, const char *fmt )
+{
+    char *s1 = str_format_time( fmt );
+    char *s2 = str_format_meta( input, s1 );
+    free( s1 );
+    return s2;
+}
 
 VLC_API void filename_sanitize( char * );
 VLC_API void path_sanitize( char * );
 
+VLC_API time_t str_duration( const char * );
+
 /**
  * @}
  */