[vlc-commits] macosx: only set b_nonembedded to true if they is no video inside main window

[David Fuhrmann]

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

macosx: only set b_nonembedded to true if they is no video inside main window

This fixes several bugs, when we start first vout in main window, but a second one
inside a extra video window.

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

 modules/gui/macosx/MainWindow.h              |    2 ++
 modules/gui/macosx/VLCVoutWindowController.m |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index dfc1fbb..5669f0e 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -86,7 +86,9 @@
 
     NSMutableArray *o_sidebaritems;
 
+    /* this is only true, when we have NO video playing inside the main window */
     BOOL              b_nonembedded;
+
     BOOL              b_podcastView_displayed;
 
     /* set to yes if we are fullscreen and all animations are over */
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 3e74c26..6e3ea1c 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -139,7 +139,9 @@
     }
     [o_new_video_window setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
 
-    [[VLCMainWindow sharedInstance] setNonembedded:b_nonembedded];
+    if (!b_multiple_vout_windows)
+        [[VLCMainWindow sharedInstance] setNonembedded:b_nonembedded];
+
     [o_vout_view setVoutThread:(vout_thread_t *)p_wnd->p_parent];
     [o_vout_dict setObject:[o_new_video_window autorelease] forKey:[NSValue valueWithPointer:p_wnd]];