MacOSX: fix macosx-embedded -> embedded-video migration

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index c91214b24c515a7121e6be9b5281207448ffb720..0b87bf1050d52435e2bf1de28934937adfe67059 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -335,7 +335,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
         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, "video-embeded", [o_intf_embedded_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" );

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index bc7900e9ba4af45ceddbd17678ff61a14a723029..11e7cc0f6105b58ea916565441ef1734f0e89d00 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -722,7 +722,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-background", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-black", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
+    var_Create( p_vout, "embedded-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
     /* We only wait for NSApp to initialise if we're not embedded (as in the
      * case of the Mozilla plugin).  We can tell whether we're embedded or not

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a372d4a2100b0bddafe74b880aac6115b641e828..e309284b22ad7d0895e795bdf5b6c8a1f55f9aee 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1467,6 +1467,9 @@ vlc_module_begin();
         change_short('f');
     add_bool( "embedded-video", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
               VLC_TRUE );
+#ifdef __APPLE__
+       add_deprecated_alias( "macosx-embedded" ); /*deprecated since 0.9.0 */
+#endif
     add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
               DROP_LATE_FRAMES_LONGTEXT, VLC_TRUE );
     /* Used in vout_synchro */