Skip to content

V
vlc-2-2
Commit 63aadee0 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

Qt: str_format_meta: fix few variable names

parent f6d71f73
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/text/strings.c
View file @ 63aadee0
......@@ -738,12 +738,12 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
break;
case 's':
{
char *lang = NULL;
char *psz_lang = NULL;
if( p_input )
lang = var_GetNonEmptyString( p_input, "sub-language" );
if( lang == NULL )
lang = strdup( b_empty_if_na ? "" : "-" );
INSERT_STRING( lang );
psz_lang = var_GetNonEmptyString( p_input, "sub-language" );
if( psz_lang == NULL )
psz_lang = strdup( b_empty_if_na ? "" : "-" );
INSERT_STRING( psz_lang );
break;
}
case 't':
......@@ -901,21 +901,21 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'Z':
if( p_item )
{
char *now_playing = input_item_GetNowPlaying( p_item );
if ( now_playing == NULL )
char *psz_now_playing = input_item_GetNowPlaying( p_item );
if ( psz_now_playing == NULL )
{
char *temp = input_item_GetTitleFbName( p_item );
char *psz_temp = input_item_GetTitleFbName( p_item );
char *psz_artist = input_item_GetArtist( p_item );
if( !EMPTY_STR( temp ) )
if( !EMPTY_STR( psz_temp ) )
{
INSERT_STRING( temp );
INSERT_STRING( psz_temp );
if ( !EMPTY_STR( psz_artist ) )
INSERT_STRING_NO_FREE( " - " );
}
INSERT_STRING( psz_artist );
}
else
INSERT_STRING( now_playing );
INSERT_STRING( psz_now_playing );
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment