vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Aug 22 15:45:45 2012 +0200| [5175451c90d066c99c17793559fcec1f289e5cb1] | committer: Jean-Baptiste Kempf
Core: display $Z as Artist - Title This is more coherent with the rest of the worlds... (cherry picked from commit 1c81c0863ba03ec8022aed8a8e3bac81884dd509) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5175451c90d066c99c17793559fcec1f289e5cb1 --- src/text/strings.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/text/strings.c b/src/text/strings.c index c1a7493..f11093d 100644 --- a/src/text/strings.c +++ b/src/text/strings.c @@ -903,17 +903,17 @@ char *str_format_meta( vlc_object_t *p_object, const char *string ) if( p_item ) { char *psz_now_playing = input_item_GetNowPlaying( p_item ); - if ( psz_now_playing == NULL ) + if( EMPTY_STR( psz_now_playing ) ) { char *psz_temp = input_item_GetTitleFbName( p_item ); char *psz_artist = input_item_GetArtist( p_item ); - if( !EMPTY_STR( psz_temp ) ) + if( !EMPTY_STR( psz_artist ) ) { - INSERT_STRING( psz_temp ); - if ( !EMPTY_STR( psz_artist ) ) + INSERT_STRING( psz_artist ); + if ( !EMPTY_STR( psz_temp ) ) INSERT_STRING_NO_FREE( " - " ); } - INSERT_STRING( psz_artist ); + INSERT_STRING( psz_temp ); } else INSERT_STRING( psz_now_playing ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
