Remove picture qtype support code

[vlc] / include / vlc_strings.h

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 9b4d0944cf94b6c4208fe26f2d92caee8fb7459c..91592826f20551b2a5cf6f661ad437acded65d0d 100644 (file)
--- a/include/vlc_strings.h
+++ b/include/vlc_strings.h
@@ -45,10 +45,15 @@ 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( playlist_t *, 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_API void filename_sanitize( char * );
 VLC_API void path_sanitize( char * );