macosx: use video-wallpaper instead of macosx-background, and fix some small issue

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index ae6d3cac861f5b2d269c8f39a4b60f82cc259db6..4df07f65507b9cf314f0b3e1a6ffae812be2b6e7 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1804,8 +1804,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (void)setupVideoView
 {
-    // TODO: make lion fullscreen compatible with macosx-background and !embedded-video
-    if (var_InheritBool(VLCIntf, "macosx-background") && !b_nativeFullscreenMode) {
+    // TODO: make lion fullscreen compatible with video-wallpaper and !embedded-video
+    if (var_InheritBool(VLCIntf, "video-wallpaper") && !b_nativeFullscreenMode) {
         msg_Dbg(VLCIntf, "Creating background window");
         NSScreen *screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_InheritInteger(VLCIntf, "macosx-vdev")];
         if (!screen)
@@ -1971,7 +1971,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 {
     nativeVideoSize = size;
 
-    if (var_InheritBool(VLCIntf, "macosx-video-autoresize") && !b_fullscreen && !var_InheritBool(VLCIntf, "macosx-background"))
+    if (var_InheritBool(VLCIntf, "macosx-video-autoresize") && !b_fullscreen && !var_InheritBool(VLCIntf, "video-wallpaper"))
         [self performSelectorOnMainThread:@selector(resizeWindow) withObject:nil waitUntilDone:NO];
 }
 

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 304f36949c9abdb6d9e136cc0b5f2949f549f717..240a40da4732d94bea02f842f42067655b673762 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1371,7 +1371,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (void)setWindowLevel:(NSNumber*)state
 {
-    if (var_InheritBool(p_intf, "macosx-background"))
+    if (var_InheritBool(p_intf, "macosx-background") || [[[[VLCMainWindow sharedInstance] videoView] window] level] < NSNormalWindowLevel)
         return;
 
     if ([state unsignedIntValue] & VOUT_WINDOW_STATE_ABOVE)

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index c1d8139a795fc90fd0bae78e80556eed4e101b48..a8b2247c941c30c8ed6a84574ffebcafb712ea30 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -116,9 +116,6 @@ void WindowClose  (vout_window_t *);
 #define PLAYMODEBUTTONS_TEXT N_("Show play mode control buttons")
 #define PLAYMODEBUTTONS_LONGTEXT N_("Shows the shuffle and repeat buttons in the main window")
 
-#define BACKGROUND_TEXT N_("Use as desktop background")
-#define BACKGROUND_LONGTEXT N_("Use the video as the desktop background.")
-
 vlc_module_begin ()
     set_description(N_("Mac OS X interface"))
     set_capability("interface", 200)
@@ -144,7 +141,6 @@ vlc_module_begin ()
     add_bool("macosx-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true)
     add_bool("macosx-show-playback-buttons", false, JUMPBUTTONS_TEXT, JUMPBUTTONS_LONGTEXT, false)
     add_bool("macosx-show-playmode-buttons", true, PLAYMODEBUTTONS_TEXT, PLAYMODEBUTTONS_LONGTEXT, false)
-    add_bool("macosx-background", false, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, false)
 
     add_submodule ()
         set_description("Mac OS X Video Output Provider")