qt4/macosx: fixed the embedded vout setting

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 7ece9f53f24d3af732622fd257c57ffc08d5ff6a..c91214b24c515a7121e6be9b5281207448ffb720 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -180,7 +180,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
     [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, "embeded-video" )];
+    [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
 
 
     /******************
@@ -305,6 +305,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     if( i_return == NSAlertAlternateReturn )
     {
         config_ResetAll( p_intf );
+        b_intfSettingChanged, b_videoSettingChanged, b_audioSettingChanged = YES;
         [self resetControls];
     }
 }

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 7ef24e74e927f65de4fb2f6afe69927049591eec..bc7900e9ba4af45ceddbd17678ff61a14a723029 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -749,7 +749,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         {
             if ( VLCIntf && !(p_vout->b_fullscreen) &&
                         !(var_GetBool( p_vout, "macosx-background" )) &&
-                        var_GetBool( p_vout, "video-embeded") )
+                        var_GetBool( p_vout, "embedded-video") )
             {
                 o_return = [[[VLCMain sharedInstance] getEmbeddedList]
                                                             getEmbeddedVout];
@@ -1030,7 +1030,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     p_real_vout = [VLCVoutView getRealVout: p_vout];
     i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
     b_black = NO;
-    b_embedded = var_GetBool( p_vout, "video-embeded" );
+    b_embedded = var_GetBool( p_vout, "embedded-video" );
 
     /* Find out on which screen to open the window */
     o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 31936d5ee55ba04226b1792757b75ad399b99292..0d3874e23109806b0c52f1b67fa2bee7bf7d99e1 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -451,7 +451,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.updatesDays->hide();
 #endif
             CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
-            CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo );
+            CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
             CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
                     skinBrowse );
 #if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__)