macosx: Close embedded if fullscreen ended.

[vlc] / modules / gui / macosx / simple_prefs.m

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index d3ea3db9aebcbed6a35fb057c30ad123c443c3e2..fa6532af87ef15f90bf384921ed4d30c2f16d2b7 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -258,7 +258,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_intf_embedded_ckb setTitle: _NS("Add controls to the video window")];
     [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
     [o_intf_lang_txt setStringValue: _NS("Language")];
-    [o_intf_meta_ckb setTitle: _NS("Fetch the metadata from the Internet")];
     [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
     
     /* Subtitles and OSD */
@@ -276,7 +275,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
     /* video */
     [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
-    [o_video_device_txt setStringValue: _NS("Display device")];
+    [o_video_device_txt setStringValue: _NS("Fullscreen Video Device")];
     [o_video_display_box setTitle: _NS("Display")];
     [o_video_enable_ckb setTitle: _NS("Enable Video")];
     [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
@@ -365,7 +364,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     SetupStringList( o_intf_lang_pop, "language" );
     SetupIntList( o_intf_art_pop, "album-art" );
 
-    [o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )];
     [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )];
     [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
 
@@ -684,13 +682,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         SaveStringList( o_intf_lang_pop, "language" );
         SaveIntList( o_intf_art_pop, "album-art" );
 
-        config_PutInt( p_intf, "fetch-meta", [o_intf_meta_ckb state] );
         config_PutInt( p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state] );
         config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] );
 
         /* okay, let's save our changes to vlcrc */
         i = config_SaveConfigFile( p_intf, "main" );
-        i = config_SaveConfigFile( p_intf, "macosx" );
+        i = i + config_SaveConfigFile( p_intf, "macosx" );
 
         if( i != 0 )
         {
@@ -740,9 +737,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         {   
             [o_audio_last_ckb setEnabled: YES];
             if( [o_audio_last_ckb state] == NSOnState )
-                config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+                config_AddIntf( p_intf, "audioscrobbler" );
             else
-                config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+                config_RemoveIntf( p_intf, "audioscrobbler" );
 
             config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] );
             config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_sfld stringValue] UTF8String] );