macosx: don't allow lion fullscreen in combination with nonembedded window

If you try to combine both features, you will end up in an fullscreen window with
playlist and overlayed video controls. Therefore make sure that both cannot be enabled
in simple prefs, and in case the user used advanced prefs, priorize nonembedded window
over the lion fullscreen.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 051f8476664a5e329169d38ced11e6e47f96020e)

modules/gui/macosx/MainWindow.m

@@ -122,9 +122,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)awakeFromNib
 {
     /* setup the styled interface */
-#ifndef MAC_OS_X_VERSION_10_7
     b_nativeFullscreenMode = NO;
-#else
+#ifdef MAC_OS_X_VERSION_10_7
+    if( config_GetInt( VLCIntf, "embedded-video" ))
         b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
 #endif
     i_lastShownVolume = -1;

modules/gui/macosx/intf.m

@@ -626,6 +626,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* yeah, we are done */
     b_nativeFullscreenMode = NO;
 #ifdef MAC_OS_X_VERSION_10_7
+    if( config_GetInt( VLCIntf, "embedded-video" ))
         b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
 #endif
     nib_main_loaded = TRUE;

modules/gui/macosx/simple_prefs.m

@@ -1025,6 +1025,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
 
 - (IBAction)interfaceSettingChanged:(id)sender
 {
+    if( sender == o_intf_embedded_ckb && [o_intf_embedded_ckb state] == NSOffState )
+        [o_intf_nativefullscreen_ckb setState: NSOffState];
+
+    if( sender == o_intf_nativefullscreen_ckb && [o_intf_nativefullscreen_ckb state] == NSOnState )
+        [o_intf_embedded_ckb setState: NSOnState];
+
     b_intfSettingChanged = YES;
 }