[vlc-devel] commit: Win32 Vout: set fullscreen back before quitting Vout. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct  1 01:01:38 2008 -0700| [5e7be2ae2994beb5ae8b8ca32fdd2e2fba529aa5] | committer: Jean-Baptiste Kempf 

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 at videolan.org>

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

 modules/video_output/msw/direct3d.c |    6 ++++++
 modules/video_output/msw/directx.c  |    6 +++++-
 modules/video_output/msw/glwin32.c  |    6 +++++-
 modules/video_output/msw/wingdi.c   |    6 ++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 7f771d0..5591cbb 100644
--- 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 81dd1fd..043c4a8 100644
--- 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 9a4fc87..f2c97de 100644
--- 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 d03b618..73f560b 100644
--- 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 );