macosx: removed the 'macosx-embedded' setting. It's functionality is now controlled...

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 87bd8689d5743a7b341fd70827625a9c30d9f43f..5d1ff33daf7455c14aec51f10ff62ca72d803436 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -51,9 +51,6 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define EMBEDDED_TEXT N_("Embedded video output")
-#define EMBEDDED_LONGTEXT N_( "Display the video in the controller window instead of a in separate window.")
-
 #define VDEV_TEXT N_("Video device")
 #define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
                          "videos in 'fullscreen'. The screen number correspondance can be found in "\
@@ -98,8 +95,6 @@ vlc_module_begin();
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_MAIN );
-    add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
-              VLC_FALSE );
     add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
               VLC_FALSE );
     add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 73f787c9f9f0c624ea36d937e489898419999909..7ef24e74e927f65de4fb2f6afe69927049591eec 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -722,7 +722,6 @@ 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, "macosx-embedded", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
 
     /* We only wait for NSApp to initialise if we're not embedded (as in the
@@ -750,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, "macosx-embedded") )
+                        var_GetBool( p_vout, "video-embeded") )
             {
                 o_return = [[[VLCMain sharedInstance] getEmbeddedList]
                                                             getEmbeddedVout];
@@ -1031,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, "macosx-embedded" );
+    b_embedded = var_GetBool( p_vout, "video-embeded" );
 
     /* Find out on which screen to open the window */
     o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];