break;
case GESTURE(UP,LEFT,NONE,NONE):
+ {
+ bool val = var_ToggleBool( pl_Get( p_intf ), "fullscreen" );
if( p_sys->p_vout )
- {
- var_ToggleBool( p_sys->p_vout, "fullscreen" );
- }
+ var_SetBool( p_sys->p_vout, "fullscreen", val );
break;
+ }
case GESTURE(DOWN,LEFT,NONE,NONE):
/* FIXME: Should close the vout!"*/
case ACTIONID_TOGGLE_FULLSCREEN:
{
- vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
- : VLC_OBJECT(p_playlist);
- var_ToggleBool( obj, "fullscreen" );
+ bool fs = var_ToggleBool( p_playlist, "fullscreen" );
+ if( p_vout )
+ var_SetBool( p_vout, "fullscreen", fs );
break;
}
case ACTIONID_LEAVE_FULLSCREEN:
if( p_vout )
var_SetBool( p_vout, "fullscreen", false );
+ var_SetBool( p_playlist, "fullscreen", false );
break;
case ACTIONID_ZOOM_QUARTER:
case MVLC_FULLSCREEN:
if( p_sys->p_input )
{
- vout_thread_t *p_vout;
-
- p_vout = input_GetVout( p_sys->p_input );
+ bool fs = var_ToggleBool( p_sys->p_playlist,
+ "fullscreen" );
+ vout_thread_t *p_vout = input_GetVout( p_sys->p_input );
if( p_vout )
{
- var_ToggleBool( p_vout, "fullscreen" );
+ var_SetBool( p_vout, "fullscreen", fs );
vlc_object_release( p_vout );
msg_Dbg( p_intf, "requested fullscreen toggle" );
}
{
case 'f':
case 'F':
+ {
+ bool fs;
+
+ if( !strncasecmp( psz_arg, "on", 2 ) )
+ var_SetBool( p_playlist, "fullscreen", fs = true );
+ else if( !strncasecmp( psz_arg, "off", 3 ) )
+ var_SetBool( p_playlist, "fullscreen", fs = false );
+ else
+ fs = var_ToggleBool( p_playlist, "fullscreen" );
+
if( p_input )
{
vout_thread_t *p_vout = input_GetVout( p_input );
if( p_vout )
{
- vlc_value_t val;
- bool b_update = false;
- var_Get( p_vout, "fullscreen", &val );
- val.b_bool = !val.b_bool;
- if( !strncmp( psz_arg, "on", 2 )
- && ( val.b_bool == true ) )
- {
- b_update = true;
- val.b_bool = true;
- }
- else if( !strncmp( psz_arg, "off", 3 )
- && ( val.b_bool == false ) )
- {
- b_update = true;
- val.b_bool = false;
- }
- else if( strncmp( psz_arg, "off", 3 )
- && strncmp( psz_arg, "on", 2 ) )
- b_update = true;
- if( b_update ) var_Set( p_vout, "fullscreen", val );
+ var_SetBool( p_vout, "fullscreen", fs );
vlc_object_release( p_vout );
}
}
break;
-
+ }
case 's':
case 'S':
;
/* Common control */
case 'f':
{
+ bool fs = var_ToggleBool( p_playlist, "fullscreen" );
if( p_intf->p_sys->p_input )
{
vout_thread_t *p_vout = inputGetVout( p_intf->p_sys->p_input );
if( p_vout )
{
- var_ToggleBool( p_vout, "fullscreen" );
+ var_SetBool( p_vout, "fullscreen", fs );
vlc_object_release( p_vout );
}
- else
- {
- var_ToggleBool( p_playlist, "fullscreen" );
- }
}
i_ret = 0;
break;
*/
void ActionsManager::fullscreen()
{
+ bool fs = var_ToggleBool( THEPL, "fullscreen" );
vout_thread_t *p_vout = THEMIM->getVout();
if( p_vout)
{
- var_ToggleBool( p_vout, "fullscreen" );
+ var_SetBool( p_vout, "fullscreen", fs );
vlc_object_release( p_vout );
}
}
{
PUSH_INPUTVAR( "video-es" );
PUSH_INPUTVAR( "spu-es" );
+#warning This is wrong:
PUSH_VAR( "fullscreen" );
PUSH_VAR( "video-on-top" );
PUSH_VAR( "video-wallpaper" );
void CmdFullscreen::execute()
{
+ bool fs = var_ToggleBool( pl_Get( getIntf() ), "fullscreen" );
if( getIntf()->p_sys->p_input == NULL )
return;
-
vout_thread_t *pVout = input_GetVout( getIntf()->p_sys->p_input );
if( pVout )
{
- // Switch to fullscreen
- var_ToggleBool( pVout, "fullscreen" );
+ // Switch fullscreen
+ var_SetBool( pVout, "fullscreen", fs );
vlc_object_release( pVout );
}
}