Commit 9e1f1018 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

Do not access vout_thread_t fields when it can be avoided.

Partial backport of [cc4f67fe]
parent c242f137
...@@ -1074,7 +1074,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout, ...@@ -1074,7 +1074,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s", psz_time ); vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s", psz_time );
} }
if( p_vout->b_fullscreen ) if( var_GetBool( p_vout, "fullscreen" ) )
{ {
var_Get( p_input, "position", &pos ); var_Get( p_input, "position", &pos );
vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN, vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
...@@ -1091,7 +1091,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout, ...@@ -1091,7 +1091,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
} }
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
if( p_vout->b_fullscreen ) if( var_GetBool( p_vout, "fullscreen" ) )
{ {
vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN, vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER ); i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );
......
...@@ -235,7 +235,7 @@ static void MacroDo( httpd_file_sys_t *p_args, ...@@ -235,7 +235,7 @@ static void MacroDo( httpd_file_sys_t *p_args,
p_vout = input_GetVout( p_sys->p_input ); p_vout = input_GetVout( p_sys->p_input );
if( p_vout ) if( p_vout )
{ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) );
vlc_object_release( p_vout ); vlc_object_release( p_vout );
msg_Dbg( p_intf, "requested fullscreen toggle" ); msg_Dbg( p_intf, "requested fullscreen toggle" );
} }
......
...@@ -37,7 +37,7 @@ void CmdFullscreen::execute() ...@@ -37,7 +37,7 @@ void CmdFullscreen::execute()
if( pVout ) if( pVout )
{ {
// Switch to fullscreen // Switch to fullscreen
pVout->i_changes |= VOUT_FULLSCREEN_CHANGE; var_SetBool( pVout, "fullscreen", !var_GetBool( pVout, "fullscreen" ) );
vlc_object_release( pVout ); vlc_object_release( pVout );
} }
} }
...@@ -344,7 +344,7 @@ void VlcProc::refreshInput() ...@@ -344,7 +344,7 @@ void VlcProc::refreshInput()
pVarHasVout->set( pVout != NULL ); pVarHasVout->set( pVout != NULL );
if( pVout ) if( pVout )
{ {
pVarFullscreen->set( pVout->b_fullscreen ); pVarFullscreen->set( var_GetBool( pVout, "fullscreen" ) );
vlc_object_release( pVout ); vlc_object_release( pVout );
} }
......
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