Commit 083f1390 authored by David Fuhrmann's avatar David Fuhrmann

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

parent 8d969f7f
......@@ -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];
}
......
......@@ -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)
......
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment