Win32 Vout: set fullscreen back before quitting Vout.

This fix the big bug of disappearing of the interface in embedded mode.
(cherry picked from commit 29e96eaed0b0d38b5d812b6717f1429739ee8c3b)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 7f771d0a4fea81883c69601e88d6c672f4c1e803..5591cbb59ee27b9c9e168df16fd91f78b2711600 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -267,6 +267,12 @@ static void CloseVideo( vlc_object_t *p_this )
 
     Direct3DVoutRelease( p_vout );
 
+    if( p_vout->b_fullscreen )
+    {
+        Win32ToggleFullscreen( p_vout );
+        msg_Dbg( p_vout, "Quitting fullscreen" );
+    }
+
     if( p_vout->p_sys->p_event )
     {
         vlc_object_detach( p_vout->p_sys->p_event );

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 81dd1fd4c7e5e95dbe6cb3a23a67fd19402555a4..043c4a85965025c9e6231d74d91e4d487ff759fd 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -488,7 +488,11 @@ static void CloseVideo( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
-    msg_Dbg( p_vout, "CloseVideo" );
+    if( p_vout->b_fullscreen )
+    {
+        Win32ToggleFullscreen( p_vout );
+        msg_Dbg( p_vout, "Quitting fullscreen" );
+    }
 
     if( p_vout->p_sys->p_event )
     {

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 9a4fc8738dde3d8b9be45471679d1c8d6ce49c5e..f2c97ded2c47c977111900ea5c7734f921b0876c 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -220,7 +220,11 @@ static void CloseVideo( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
-    msg_Dbg( p_vout, "closing video" );
+    if( p_vout->b_fullscreen )
+    {
+        Win32ToggleFullscreen( p_vout );
+        msg_Dbg( p_vout, "Quitting fullscreen" );
+    }
 
     if( p_vout->p_sys->p_event )
     {

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index d03b6186c690a071106adea3e1f25047b3a7a8f5..73f560b27fa20bd168ea1ec82459cbc1265d0b47 100644 (file)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -313,6 +313,12 @@ static void CloseVideo ( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
+    if( p_vout->b_fullscreen )
+    {
+        Win32ToggleFullscreen( p_vout );
+        msg_Dbg( p_vout, "Quitting fullscreen" );
+    }
+
     if( p_vout->p_sys->p_event )
     {
         vlc_object_detach( p_vout->p_sys->p_event );