Skip to content

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

Qt: str_format_meta: fix few variable names

parent f6d71f73
Show 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 ) ...@@ -738,12 +738,12 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
break; break;
case 's': case 's':
{ {
char *lang = NULL; char *psz_lang = NULL;
if( p_input ) if( p_input )
lang = var_GetNonEmptyString( p_input, "sub-language" ); psz_lang = var_GetNonEmptyString( p_input, "sub-language" );
if( lang == NULL ) if( psz_lang == NULL )
lang = strdup( b_empty_if_na ? "" : "-" ); psz_lang = strdup( b_empty_if_na ? "" : "-" );
INSERT_STRING( lang ); INSERT_STRING( psz_lang );
break; break;
} }
case 't': case 't':
...@@ -901,21 +901,21 @@ char *str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -901,21 +901,21 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'Z': case 'Z':
if( p_item ) if( p_item )
{ {
char *now_playing = input_item_GetNowPlaying( p_item ); char *psz_now_playing = input_item_GetNowPlaying( p_item );
if ( now_playing == NULL ) 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 ); 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 ) ) if ( !EMPTY_STR( psz_artist ) )
INSERT_STRING_NO_FREE( " - " ); INSERT_STRING_NO_FREE( " - " );
} }
INSERT_STRING( psz_artist ); INSERT_STRING( psz_artist );
} }
else else
INSERT_STRING( now_playing ); INSERT_STRING( psz_now_playing );
} }
break; 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