macosx: move detached window stuff in extra xib file and only load that when necessary

Makefile.am

@@ -105,6 +105,7 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
 	extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib \
 	extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
+	extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib \
 	extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
 	extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
 	extras/package/macosx/Resources/English.lproj/MainMenu.xib \

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -434,6 +434,7 @@
 		CCDB535D13E97D3500A1782F /* dropzone-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CCDB535C13E97D3500A1782F /* dropzone-background.png */; };
 		CCE8BAC4160615D9006741FB /* effects-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC2160615D9006741FB /* effects-one-button-pressed.png */; };
 		CCE8BAC5160615D9006741FB /* effects-one-button-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE8BAC3160615D9006741FB /* effects-one-button-pressed@2x.png */; };
+		E0FB95CE1615B6DF0005069A /* DetachedVideoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -985,6 +986,7 @@
 		E0382C01160BA09E0031D7FF /* ControlsBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ControlsBar.m; path = ../../../modules/gui/macosx/ControlsBar.m; sourceTree = SOURCE_ROOT; };
 		E06CF7F416020F6200C698B7 /* Windows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Windows.h; path = ../../../modules/gui/macosx/Windows.h; sourceTree = SOURCE_ROOT; };
 		E06CF7F516020F6200C698B7 /* Windows.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Windows.m; path = ../../../modules/gui/macosx/Windows.m; sourceTree = SOURCE_ROOT; };
+		E0FB95CD1615B6DF0005069A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/DetachedVideoWindow.xib; sourceTree = "<group>"; };
 		F69B0CA702E24F6401A80112 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1731,6 +1733,7 @@
 		DCF358BC077F1236007DB450 /* xibs */ = {
 			isa = PBXGroup;
 			children = (
+				E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */,
 				CCD83E2E13FEA143004F1652 /* About.xib */,
 				CCD83E3013FEA143004F1652 /* AudioEffects.xib */,
 				CCD83E3213FEA143004F1652 /* Bookmarks.xib */,
@@ -2219,6 +2222,7 @@
 				CCE8BAC5160615D9006741FB /* effects-one-button-pressed@2x.png in Resources */,
 				7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */,
 				7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */,
+				E0FB95CE1615B6DF0005069A /* DetachedVideoWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2337,6 +2341,14 @@
 			name = Wizard.xib;
 			sourceTree = "<group>";
 		};
+		E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E0FB95CD1615B6DF0005069A /* English */,
+			);
+			name = DetachedVideoWindow.xib;
+			sourceTree = "<group>";
+		};
 		F69B0CA602E24F6401A80112 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (

modules/gui/macosx/MainWindow.h

@@ -34,6 +34,7 @@
 #import "fspanel.h"
 #import "MainWindowTitle.h"
 
+@class VLCDetachedVideoWindow;
 @class VLCMainWindowControlsBar;
 
 @interface VLCMainWindow : VLCVideoWindowCommon <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate, NSSplitViewDelegate> {
@@ -56,7 +57,7 @@
 
     IBOutlet VLCFSPanel *o_fspanel;
 
-    IBOutlet id o_detached_video_window;
+    VLCDetachedVideoWindow *o_detached_video_window;
 
     IBOutlet id o_podcast_view;
     IBOutlet id o_podcast_add_btn;

modules/gui/macosx/MainWindow.m

@@ -156,7 +156,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
         b_nativeFullscreenMode = var_InheritBool(VLCIntf, "macosx-nativefullscreenmode");
 #endif
     t_hide_mouse_timer = nil;
-    [o_detached_video_window setDelegate: self];
     [self useOptimizedDrawing: YES];
     
     [[o_search_fld cell] setPlaceholderString: _NS("Search")];
@@ -190,10 +189,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
     // Set that here as IB seems to be buggy
     if (b_dark_interface) {
         [self setContentMinSize:NSMakeSize(604., 288. + [o_titlebar_view frame].size.height)];
-        [o_detached_video_window setContentMinSize: NSMakeSize(363., f_min_video_height + [[[o_detached_video_window controlsBar] bottomBarView] frame].size.height + [o_titlebar_view frame].size.height)];
     } else {
         [self setContentMinSize:NSMakeSize(604., 288.)];
-        [o_detached_video_window setContentMinSize: NSMakeSize(363., f_min_video_height + [[[o_detached_video_window controlsBar] bottomBarView] frame].size.height)];
     }
 
     [self setTitle: _NS("VLC media player")];
@@ -628,6 +625,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 {
     [o_controls_bar updateTimeSlider];
     [[self controlsBar] updatePosAndTimeInFSPanel:o_fspanel];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] updateTimeSlider];
 }
 
@@ -648,9 +646,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
         NSURL * o_url = [NSURL URLWithString: [NSString stringWithUTF8String: uri]];
         if ([o_url isFileURL]) {
             [self setRepresentedURL: o_url];
+            if (o_detached_video_window)
                 [o_detached_video_window setRepresentedURL: o_url];
         } else {
             [self setRepresentedURL: nil];
+            if (o_detached_video_window)
                 [o_detached_video_window setRepresentedURL: nil];
         }
         free(uri);
@@ -663,7 +663,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         }
 
         [self setTitle: aString];
-        if (b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback])
+        if (b_nonembedded && o_detached_video_window && [[VLCMain sharedInstance] activeVideoPlayback])
             [o_detached_video_window setTitle: aString];
 
         [o_fspanel setStreamTitle: aString];
@@ -677,6 +677,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)updateWindow
 {
     [o_controls_bar updateControls];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] updateControls];
 
     bool b_seekable = false;
@@ -705,6 +706,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)setPause
 {
     [o_controls_bar setPause];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] setPause];
     [o_fspanel setPause];
 }
@@ -712,6 +714,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)setPlay
 {
     [o_controls_bar setPlay];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] setPlay];
     [o_fspanel setPlay];
 }
@@ -799,6 +802,23 @@ static VLCMainWindow *_o_sharedInstance = nil;
             if ([o_video_view superview] != NULL)
                 [o_video_view removeFromSuperviewWithoutNeedingDisplay];
 
+            if (!o_detached_video_window) {
+                NSWindowController *o_controller = [[NSWindowController alloc] initWithWindowNibName:@"DetachedVideoWindow"];
+                [o_controller loadWindow];
+                o_detached_video_window = (VLCDetachedVideoWindow *)[o_controller window];
+                [o_controller release];
+
+                // event occurs before window is created, so call again
+                [[VLCMain sharedInstance] playbackStatusUpdated];
+            }
+
+            [o_detached_video_window setDelegate: self];
+            if (b_dark_interface) {
+                [o_detached_video_window setContentMinSize: NSMakeSize(363., f_min_video_height + [[[o_detached_video_window controlsBar] bottomBarView] frame].size.height + [o_titlebar_view frame].size.height)];
+            } else {
+                [o_detached_video_window setContentMinSize: NSMakeSize(363., f_min_video_height + [[[o_detached_video_window controlsBar] bottomBarView] frame].size.height)];
+            }
+
             NSRect videoFrame;
             videoFrame.size = [[o_detached_video_window contentView] frame].size;
             videoFrame.size.height -= [[[o_detached_video_window controlsBar] bottomBarView] frame].size.height;
@@ -812,6 +832,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
             [[o_detached_video_window contentView] addSubview: o_video_view positioned:NSWindowAbove relativeTo:nil];
             [o_detached_video_window setLevel:NSNormalWindowLevel];
             [o_detached_video_window useOptimizedDrawing: YES];
+
             b_nonembedded = YES;
         }
     }
@@ -846,13 +867,14 @@ static VLCMainWindow *_o_sharedInstance = nil;
             [[self animator] setFrame:frameBeforePlayback display:YES];
 
         [self makeFirstResponder: nil];
+        if (o_detached_video_window)
             [o_detached_video_window orderOut: nil];
         if (o_extra_video_window)
             [o_extra_video_window orderOut: nil];
 
         if ([self level] != NSNormalWindowLevel)
             [self setLevel: NSNormalWindowLevel];
-        if ([o_detached_video_window level] != NSNormalWindowLevel)
+        if (o_detached_video_window && [o_detached_video_window level] != NSNormalWindowLevel)
             [o_detached_video_window setLevel: NSNormalWindowLevel];
 
         // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
@@ -1007,6 +1029,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     screen_rect = [screen frame];
 
     [o_controls_bar setFullscreenState:YES];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] setFullscreenState:YES];
 
     [self recreateHideMouseTimer];
@@ -1164,6 +1187,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [self lockFullscreenAnimation];
 
     [o_controls_bar setFullscreenState:NO];
+    if (o_detached_video_window)
         [[o_detached_video_window controlsBar] setFullscreenState:NO];
 
     /* We always try to do so */