[vlc-commits] macosx: properly store video-on-top state in playlist variable

[David Fuhrmann]

vlc/vlc-2.1 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Thu Apr 24 21:35:15 2014 +0200| [97c355d6091d3a85966b91ed3cd32e76bf2d3785] | committer: Felix Paul Kühne

macosx: properly store video-on-top state in playlist variable

Previous code was never called for fullscreen and video-on-top.

close #9999

(cherry picked from commit 495dbc7cb2021d3fed7e2ed075b5b3313da95efd)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 modules/gui/macosx/MainMenu.m |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 501016b..4c7a977 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -890,7 +890,9 @@ static VLCMainMenu *_o_sharedInstance = nil;
     if (p_input) {
         vout_thread_t *p_vout = getVoutForActiveWindow();
         if (p_vout) {
-            var_ToggleBool(p_vout, "video-on-top");
+            BOOL b_fs = var_ToggleBool(p_vout, "video-on-top");
+            var_SetBool(pl_Get(p_intf), "video-on-top", b_fs);
+
             vlc_object_release(p_vout);
         }
         vlc_object_release(p_input);
@@ -1431,10 +1433,6 @@ static VLCMainMenu *_o_sharedInstance = nil;
     assert([data isKindOfClass:[VLCAutoGeneratedMenuContent class]]);
     VLCAutoGeneratedMenuContent *menuContent = (VLCAutoGeneratedMenuContent *)data;
 
-    /* Preserve settings across vouts via the playlist object: */
-    if (!strcmp([menuContent name], "fullscreen") || !strcmp([menuContent name], "video-on-top"))
-        var_Set(pl_Get(VLCIntf), [menuContent name] , [menuContent value]);
-
     p_object = [menuContent vlcObject];
 
     if (p_object != NULL) {