From 6cf432c2dd4a81a68f2a09b66fb2b321ac90c298 Mon Sep 17 00:00:00 2001 From: Damien Fouilleul Date: Wed, 20 Feb 2008 23:35:12 +0000 Subject: [PATCH] MacOSX: fix macosx-embedded -> embedded-video migration --- modules/gui/macosx/simple_prefs.m | 2 +- modules/gui/macosx/vout.m | 2 +- src/libvlc-module.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index c91214b24c..0b87bf1050 100644 --- 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 bc7900e9ba..11e7cc0f61 100644 --- 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 a372d4a210..e309284b22 100644 --- 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 */ -- 2.39.2