[vlc-commits] vout: remove redundant fullscreen initialization

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 13 19:38:23 2014 +0300| [bc9b4ca6317432090cdb0ec82ac7b3d01a88df88] | committer: Rémi Denis-Courmont

vout: remove redundant fullscreen initialization

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc9b4ca6317432090cdb0ec82ac7b3d01a88df88
---

 modules/hw/vdpau/display.c         |    6 ------
 modules/video_output/gl.c          |    5 -----
 modules/video_output/kva.c         |   11 +++--------
 modules/video_output/msw/common.c  |    2 +-
 modules/video_output/wayland/shm.c |    4 ----
 modules/video_output/xcb/glx.c     |    6 ------
 modules/video_output/xcb/x11.c     |    6 ------
 modules/video_output/xcb/xvideo.c  |    6 ------
 8 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 0f03ba5..37caca3 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -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:
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 21bbc56..0e83d63 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -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;
diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index 5b2fc0b..d4a1153 100644
--- a/modules/video_output/kva.c
+++ b/modules/video_output/kva.c
@@ -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();
 
diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index cd5c0e5..fa9fb86 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -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;
diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index f20982b..62b336c 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -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:
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 3287f4b..27a3875 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -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:
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 58152b0..df11beb 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -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:
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index ef61d32..a4324a5 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -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: