Skip to content

V
vlc-1.1
Commit 9a8505c3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Hotkeys: cleanup variable use

parent e1e7a510
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 71 deletions
modules/control/hotkeys.c
View file @ 9a8505c3
...@@ -163,7 +163,6 @@ static void Run( intf_thread_t *p_intf ) ...@@ -163,7 +163,6 @@ static void Run( intf_thread_t *p_intf )
{ {
vout_thread_t *p_vout = NULL; vout_thread_t *p_vout = NULL;
aout_instance_t *p_aout = NULL; aout_instance_t *p_aout = NULL;
vlc_value_t val;
playlist_t *p_playlist = pl_Hold( p_intf ); playlist_t *p_playlist = pl_Hold( p_intf );
int canc = vlc_savecancel(); int canc = vlc_savecancel();
...@@ -259,18 +258,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -259,18 +258,10 @@ static void Run( intf_thread_t *p_intf )
} }
else if( i_action == ACTIONID_TOGGLE_FULLSCREEN ) else if( i_action == ACTIONID_TOGGLE_FULLSCREEN )
{ {
if( p_vout ) vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
{ : VLC_OBJECT(p_playlist);
var_Get( p_vout, "fullscreen", &val ); bool b = var_GetBool( obj, "fullscreen" );
val.b_bool = !val.b_bool; var_SetBool( obj, "fullscreen", !b );
var_Set( p_vout, "fullscreen", val );
}
else
{
var_Get( p_playlist, "fullscreen", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "fullscreen", val );
}
} }
else if( i_action == ACTIONID_LEAVE_FULLSCREEN ) else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
{ {
...@@ -286,83 +277,67 @@ static void Run( intf_thread_t *p_intf ) ...@@ -286,83 +277,67 @@ static void Run( intf_thread_t *p_intf )
{ {
if( p_vout ) if( p_vout )
{ {
if( i_action == ACTIONID_ZOOM_QUARTER ) float f;
val.f_float = 0.25; switch( i_action )
if( i_action == ACTIONID_ZOOM_HALF )
val.f_float = 0.5;
if( i_action == ACTIONID_ZOOM_ORIGINAL )
val.f_float = 1;
if( i_action == ACTIONID_ZOOM_DOUBLE )
val.f_float = 2;
var_Set( p_vout, "zoom", val );
}
}
else if( i_action == ACTIONID_WALLPAPER )
{ {
if( p_vout ) case ACTIONID_ZOOM_QUARTER: f = 0.25; break;
{ case ACTIONID_ZOOM_HALF: f = 0.5; break;
var_Get( p_vout, "directx-wallpaper", &val ); case ACTIONID_ZOOM_ORIGINAL: f = 1.; break;
val.b_bool = !val.b_bool; /*case ACTIONID_ZOOM_DOUBLE:*/
var_Set( p_vout, "directx-wallpaper", val ); default: f = 2.; break;
}
var_SetFloat( p_vout, "zoom", f );
} }
else
{
var_Get( p_playlist, "directx-wallpaper", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "directx-wallpaper", val );
} }
#ifdef WIN32
else if( i_action == ACTIONID_WALLPAPER )
{ /* FIXME: this is invalid if not using DirectX output!!! */
vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
: VLC_OBJECT(p_playlist);
bool b = var_GetBool( obj, "directx-wallpaper" );
var_SetBool( obj, "directx-wallpaper", !b );
} }
#endif
/* Playlist actions */ /* Playlist actions */
else if( i_action == ACTIONID_LOOP ) else if( i_action == ACTIONID_LOOP )
{ {
/* Toggle Normal -> Loop -> Repeat -> Normal ... */ /* Toggle Normal -> Loop -> Repeat -> Normal ... */
vlc_value_t val2; if( var_GetBool( p_playlist, "repeat" ) )
var_Get( p_playlist, "loop", &val ); var_SetBool( p_playlist, "repeat", false );
var_Get( p_playlist, "repeat", &val2 );
if( val2.b_bool == true )
{
val.b_bool = false;
val2.b_bool = false;
}
else if( val.b_bool == true )
{
val.b_bool = false;
val2.b_bool = true;
}
else else
{ if( var_GetBool( p_playlist, "loop" ) )
val.b_bool = true; { /* FIXME: this is not atomic, we should use a real tristate */
var_SetBool( p_playlist, "loop", false );
var_SetBool( p_playlist, "repeat", true );
} }
var_Set( p_playlist, "loop", val ); else
var_Set( p_playlist, "repeat", val2 ); var_SetBool( p_playlist, "loop", true );
} }
else if( i_action == ACTIONID_RANDOM ) else if( i_action == ACTIONID_RANDOM )
{ {
var_Get( p_playlist, "random", &val ); bool b = var_GetBool( p_playlist, "random" );
val.b_bool = !val.b_bool; var_SetBool( p_playlist, "random", !b );
var_Set( p_playlist, "random", val );
} }
else if( i_action == ACTIONID_PLAY_PAUSE ) else if( i_action == ACTIONID_PLAY_PAUSE )
{ {
val.i_int = PLAYING_S;
if( p_input ) if( p_input )
{ {
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
var_Get( p_input, "state", &val ); int state = var_GetInteger( p_input, "state" );
if( val.i_int != PAUSE_S ) if( state != PAUSE_S )
{ {
vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN, vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
OSD_PAUSE_ICON ); OSD_PAUSE_ICON );
val.i_int = PAUSE_S; state = PAUSE_S;
} }
else else
{ {
vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN, vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
OSD_PLAY_ICON ); OSD_PLAY_ICON );
val.i_int = PLAYING_S; state = PLAYING_S;
} }
var_Set( p_input, "state", val ); var_SetInteger( p_input, "state", state );
} }
else else
{ {
...@@ -421,14 +396,12 @@ static void Run( intf_thread_t *p_intf ) ...@@ -421,14 +396,12 @@ static void Run( intf_thread_t *p_intf )
if( i_action == ACTIONID_PAUSE ) if( i_action == ACTIONID_PAUSE )
{ {
var_Get( p_input, "state", &val ); if( var_GetInteger( p_input, "state" ) != PAUSE_S )
if( val.i_int != PAUSE_S )
{ {
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN, vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
OSD_PAUSE_ICON ); OSD_PAUSE_ICON );
val.i_int = PAUSE_S; var_SetInteger( p_input, "state", PAUSE_S );
var_Set( p_input, "state", val );
} }
} }
else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT
...@@ -437,8 +410,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -437,8 +410,8 @@ static void Run( intf_thread_t *p_intf )
#define SET_TIME( a, b ) \ #define SET_TIME( a, b ) \
i_interval = config_GetInt( p_input, a "-jump-size" ); \ i_interval = config_GetInt( p_input, a "-jump-size" ); \
if( i_interval > 0 ) { \ if( i_interval > 0 ) { \
val.i_time = (mtime_t)(i_interval * b) * 1000000L; \ mtime_t i_time = (mtime_t)(i_interval * b) * 1000000L; \
var_Set( p_input, "time-offset", val ); \ var_SetTime( p_input, "time-offset", i_time ); \
DisplayPosition( p_intf, p_vout, p_input ); \ DisplayPosition( p_intf, p_vout, p_input ); \
} }
SET_TIME( "extrashort", -1 ); SET_TIME( "extrashort", -1 );
...@@ -849,12 +822,9 @@ static void Run( intf_thread_t *p_intf ) ...@@ -849,12 +822,9 @@ static void Run( intf_thread_t *p_intf )
} }
else if( i_action == ACTIONID_PLAY ) else if( i_action == ACTIONID_PLAY )
{ {
var_Get( p_input, "rate", &val ); if( var_GetInteger( p_input, "rate" ) != INPUT_RATE_DEFAULT )
if( val.i_int != INPUT_RATE_DEFAULT )
{
/* Return to normal speed */ /* Return to normal speed */
var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT ); var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
}
else else
{ {
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
......
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