[vlc-commits] macosx: only set videoplayback to false when last vout window closes

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat Oct 27 13:13:21 2012 +0200| [b93441d79adb1141d36baa92d1a6cf844bf7d152] | committer: David Fuhrmann

macosx: only set videoplayback to false when last vout window closes

For instance, when we disable visualisations, the playback isn't finished yet,
necessarily.

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

 modules/gui/macosx/VLCVoutWindowController.m |    3 +++
 modules/gui/macosx/intf.m                    |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index f386d78..3e74c26 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -168,6 +168,9 @@
 
     [[o_window videoView] releaseVoutThread];
     [o_vout_dict removeObjectForKey:o_key];
+
+    if ([o_vout_dict count] == 0)
+        [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
 }
 
 - (void)updateWindowsControlsBarWithSelector:(SEL)aSel
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 2138968..0da7f13 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -240,7 +240,6 @@ static int WindowControl(vout_window_t *p_wnd, int i_query, va_list args)
 void WindowClose(vout_window_t *p_wnd)
 {
     NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
-    [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
 
     [[[VLCMain sharedInstance] voutController] performSelectorOnMainThread:@selector(removeVoutforDisplay:) withObject:[NSValue valueWithPointer:p_wnd] waitUntilDone:NO];