vlc_meta.h: introduced VLC_META_NOW_PLAYING. http.c: use NOW_PLAYING for song title.

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index e7198fe543ab408a377966772e7b060812395722..0d455117b7742f2608a89b4f82b67a51336e6fd8 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -36,6 +36,7 @@
 #define VLC_META_SETTING            N_("Setting")
 #define VLC_META_URL                N_("URL")
 #define VLC_META_LANGUAGE           N_("Language")
+#define VLC_META_NOW_PLAYING        N_("Now Playing")
 
 #define VLC_META_CDDB_ARTIST        N_("CDDB Artist")
 #define VLC_META_CDDB_CATEGORY      N_("CDDB Category")  

diff --git a/modules/access/http.c b/modules/access/http.c
index e2194c32a97fefdf2bb2ef17ba0fd72cf05f3f59..9a13d21046824aef0f6980e4a75365d3a26d8f28 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -749,13 +749,13 @@ static int Control( access_t *p_access, int i_query, va_list args )
             msg_Dbg( p_access, "GET META %s %s %s",
                      p_sys->psz_icy_name, p_sys->psz_icy_genre, p_sys->psz_icy_title );
             if( p_sys->psz_icy_name )
-                vlc_meta_Add( *pp_meta, VLC_META_DESCRIPTION,
+                vlc_meta_Add( *pp_meta, VLC_META_TITLE,
                               p_sys->psz_icy_name );
             if( p_sys->psz_icy_genre )
                 vlc_meta_Add( *pp_meta, VLC_META_GENRE,
                               p_sys->psz_icy_genre );
             if( p_sys->psz_icy_title )
-                vlc_meta_Add( *pp_meta, VLC_META_TITLE,
+                vlc_meta_Add( *pp_meta, VLC_META_NOW_PLAYING,
                               p_sys->psz_icy_title );
             break;