Commit bc9b4ca6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vout: remove redundant fullscreen initialization

parent 80099418
......@@ -664,12 +664,6 @@ static int Open(vlc_object_t *obj)
vd->control = Control;
vd->manage = Manage;
/* */
bool is_fullscreen = vd->cfg->is_fullscreen;
if (is_fullscreen && vout_window_SetFullScreen(sys->embed, true))
is_fullscreen = false;
vout_display_SendEventFullscreen(vd, is_fullscreen);
return VLC_SUCCESS;
error:
......
......@@ -150,11 +150,6 @@ static int Open (vlc_object_t *obj)
if (sys->vgl == NULL)
goto error;
bool fs = vd->cfg->is_fullscreen;
if (vout_window_SetFullScreen (sys->gl->surface, fs))
fs = false;
vout_display_SendEventFullscreen (vd, fs);
vd->sys = sys;
vd->info.has_pictures_invalid = false;
vd->info.has_event_thread = false;
......
......@@ -265,14 +265,9 @@ static void PMThread( void *arg )
goto exit_open_display;
}
if( vd->cfg->is_fullscreen )
{
if( sys->parent_window )
vout_window_SetFullScreen(sys->parent_window, true);
else
WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE,
MPFROMLONG( true ), 0 );
}
if( vd->cfg->is_fullscreen && !sys->parent_window )
WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE,
MPFROMLONG( true ), 0 );
kvaDisableScreenSaver();
......
......@@ -472,7 +472,7 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen)
/* */
if (sys->parent_window)
return vout_window_SetFullScreen(sys->parent_window, is_fullscreen);
return VLC_EGENERIC;
/* */
HWND hwnd = sys->hparent && sys->hfswnd ? sys->hfswnd : sys->hwnd;
......
......@@ -466,10 +466,6 @@ static int Open(vlc_object_t *obj)
vd->control = Control;
vd->manage = NULL;
bool is_fullscreen = vd->cfg->is_fullscreen;
if (is_fullscreen && vout_window_SetFullScreen(sys->embed, true))
is_fullscreen = false;
vout_display_SendEventFullscreen(vd, is_fullscreen);
return VLC_SUCCESS;
error:
......
......@@ -128,12 +128,6 @@ static int Open (vlc_object_t *obj)
vd->control = Control;
vd->manage = Manage;
/* */
bool fs = vd->cfg->is_fullscreen;
if (vout_window_SetFullScreen (surface, fs))
fs = false;
vout_display_SendEventFullscreen (vd, fs);
return VLC_SUCCESS;
error:
......
......@@ -310,12 +310,6 @@ found_format:;
vd->control = Control;
vd->manage = Manage;
/* */
bool is_fullscreen = vd->cfg->is_fullscreen;
if (is_fullscreen && vout_window_SetFullScreen (sys->embed, true))
is_fullscreen = false;
vout_display_SendEventFullscreen (vd, is_fullscreen);
return VLC_SUCCESS;
error:
......
......@@ -588,12 +588,6 @@ static int Open (vlc_object_t *obj)
vd->control = Control;
vd->manage = Manage;
/* */
bool is_fullscreen = vd->cfg->is_fullscreen;
if (is_fullscreen && vout_window_SetFullScreen (p_sys->embed, true))
is_fullscreen = false;
vout_display_SendEventFullscreen (vd, is_fullscreen);
return VLC_SUCCESS;
error:
......
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