[vlc-commits] macosx/vout window: remove legacy playlist call

Felix Paul Kühne git at videolan.org
Tue Mar 26 16:41:55 CET 2019


vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Tue Mar 26 15:30:03 2019 +0100| [964354e56f4792e76813ab906e7456f4ff75fb20] | committer: Felix Paul Kühne

macosx/vout window: remove legacy playlist call

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

 modules/gui/macosx/windows/video/VLCVideoWindowCommon.m | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
index 0010023c4d..ab972fad68 100644
--- a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
+++ b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Windows.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2012-2018 VLC authors and VideoLAN
+ * Copyright (C) 2012-2019 VLC authors and VideoLAN
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
  *          David Fuhrmann <david dot fuhrmann at googlemail dot com>
@@ -32,7 +32,7 @@
 #import "windows/video/VLCVoutView.h"
 #import "playlist/VLCPlaylistController.h"
 #import "playlist/VLCPlayerController.h"
-#import <vlc_playlist_legacy.h>
+//#import <vlc_playlist_legacy.h>
 
 /*****************************************************************************
  * VLCVideoWindowCommon
@@ -448,12 +448,13 @@
 
     _inFullscreenTransition = YES;
 
-    var_SetBool(pl_Get(getIntf()), "fullscreen", true);
+    VLCPlayerController *playerController = [[[VLCMain sharedInstance] playlistController] playerController];
+    playerController.fullscreen = YES;
 
     frameBeforeLionFullscreen = [self frame];
 
     if ([self hasActiveVideo]) {
-        vout_thread_t *p_vout = [[[[VLCMain sharedInstance] playlistController] playerController] videoOutputThreadForKeyWindow];
+        vout_thread_t *p_vout = [playerController videoOutputThreadForKeyWindow];
         if (p_vout) {
             var_SetBool(p_vout, "fullscreen", true);
             vout_Release(p_vout);
@@ -497,9 +498,10 @@
     [self setFullscreen: NO];
 
     if ([self hasActiveVideo]) {
-        var_SetBool(pl_Get(getIntf()), "fullscreen", false);
+        VLCPlayerController *playerController = [[[VLCMain sharedInstance] playlistController] playerController];
+        playerController.fullscreen = NO;
 
-        vout_thread_t *p_vout = [[[[VLCMain sharedInstance] playlistController] playerController] videoOutputThreadForKeyWindow];
+        vout_thread_t *p_vout = [playerController videoOutputThreadForKeyWindow];
         if (p_vout) {
             var_SetBool(p_vout, "fullscreen", false);
             vout_Release(p_vout);



More information about the vlc-commits mailing list