Skip to content

V
vlc
Commit 3cc651e5 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Add option to format strings to prevent displaying dashes if the meta info was... 

Add option to format strings to prevent displaying dashes if the meta info was unavailable (ie: if time is unavailable, "$T" will display "--:--:--" while "$ T" won't display anything). This is of course completely untested :)
parent 63c7e4a5
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 12 deletions
src/text/strings.c
View file @ 3cc651e5
...@@ -657,6 +657,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -657,6 +657,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
char *dst = malloc( 1000 ); char *dst = malloc( 1000 );
char *d = dst; char *d = dst;
int b_is_format = 0; int b_is_format = 0;
int b_empty_if_na = 0;
char buf[10]; char buf[10];
int i_size = strlen( string ); int i_size = strlen( string );
...@@ -729,7 +730,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -729,7 +730,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
lang = strdup( "-" ); lang = strdup( b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, lang ); INSERT_STRING( 1, lang );
free( lang ); free( lang );
...@@ -755,7 +756,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -755,7 +756,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "-" ); sprintf( buf, b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -767,7 +768,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -767,7 +768,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "-" ); sprintf( buf, b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -781,7 +782,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -781,7 +782,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "--:--:--" ); sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -796,7 +797,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -796,7 +797,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "-" ); sprintf( buf, b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -810,7 +811,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -810,7 +811,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "--:--:--" ); sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -826,7 +827,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -826,7 +827,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
lang = strdup( "-" ); lang = strdup( b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, lang ); INSERT_STRING( 1, lang );
free( lang ); free( lang );
...@@ -840,7 +841,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -840,7 +841,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "--.-%%" ); sprintf( buf, b_empty_if_na ? "" : "--.-%%" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -852,7 +853,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -852,7 +853,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "-" ); sprintf( buf, b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -864,7 +865,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -864,7 +865,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "-" ); sprintf( buf, b_empty_if_na ? "" : "-" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -878,7 +879,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -878,7 +879,7 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
} }
else else
{ {
sprintf( buf, "--:--:--" ); sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
} }
INSERT_STRING( 1, buf ); INSERT_STRING( 1, buf );
break; break;
...@@ -899,16 +900,22 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string ) ...@@ -899,16 +900,22 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
d++; d++;
break; break;
case ' ':
b_empty_if_na = 1;
break;
default: default:
*d = *s; *d = *s;
d++; d++;
break; break;
} }
if( *s != ' ' )
b_is_format = 0; b_is_format = 0;
} }
else if( *s == '$' ) else if( *s == '$' )
{ {
b_is_format = 1; b_is_format = 1;
b_empty_if_na = 0;
} }
else else
{ {
......
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