Skip to content

V
vlc-1.1
Commit 250f8123 authored by Felix Kühne's avatar Felix Kühne
Browse files
Options

macosx: fixed some compilation warnings

parent 93442c63
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
modules/gui/macosx/controls.m
View file @ 250f8123
...@@ -207,12 +207,12 @@ ...@@ -207,12 +207,12 @@
var_Set( p_playlist, "random", val ); var_Set( p_playlist, "random", val );
if( val.b_bool ) if( val.b_bool )
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random On" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Random On" ) );
config_PutInt( p_playlist, "random", 1 ); config_PutInt( p_playlist, "random", 1 );
} }
else else
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Random Off" ) );
config_PutInt( p_playlist, "random", 0 ); config_PutInt( p_playlist, "random", 0 );
} }
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
config_PutInt( p_playlist, "loop", 0 ); config_PutInt( p_playlist, "loop", 0 );
/* show the change */ /* show the change */
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat One" ) );
} }
else if( repeating.b_bool && !looping.b_bool ) else if( repeating.b_bool && !looping.b_bool )
{ {
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
config_PutInt( p_playlist, "loop", 1 ); config_PutInt( p_playlist, "loop", 1 );
/* show the change */ /* show the change */
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat All" ) );
} }
else else
{ {
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
config_PutInt( p_playlist, "loop", 0 ); config_PutInt( p_playlist, "loop", 0 );
/* show the change */ /* show the change */
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
} }
/* communicate with core and the main intf loop */ /* communicate with core and the main intf loop */
...@@ -336,12 +336,12 @@ ...@@ -336,12 +336,12 @@
var_Set( p_playlist, "repeat", val ); var_Set( p_playlist, "repeat", val );
if( val.b_bool ) if( val.b_bool )
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat One" ) );
config_PutInt( p_playlist, "repeat", 1 ); config_PutInt( p_playlist, "repeat", 1 );
} }
else else
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
config_PutInt( p_playlist, "repeat", 0 ); config_PutInt( p_playlist, "repeat", 0 );
} }
...@@ -365,12 +365,12 @@ ...@@ -365,12 +365,12 @@
var_Set( p_playlist, "loop", val ); var_Set( p_playlist, "loop", val );
if( val.b_bool ) if( val.b_bool )
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat All" ) );
config_PutInt( p_playlist, "loop", 1 ); config_PutInt( p_playlist, "loop", 1 );
} }
else else
{ {
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
config_PutInt( p_playlist, "loop", 0 ); config_PutInt( p_playlist, "loop", 0 );
} }
......
modules/gui/macosx/simple_prefs.m
View file @ 250f8123
...@@ -328,7 +328,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -328,7 +328,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
else if( p_config->psz_text ) else if( p_config->psz_text )
return p_config->psz_text; return p_config->psz_text;
else else
msg_Warn( p_this, "option %s does not include any help" ); msg_Warn( p_this, "option %s does not include any help", psz_name );
return NULL; return NULL;
} }
......
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