/* generic */
+ (VLCAudioEffects *)sharedInstance;
+
+- (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (IBAction)toggleWindow:(id)sender;
- (void)setAudioFilter: (char *)psz_name on:(BOOL)b_on;
- (IBAction)profileSelectorAction:(id)sender;
#pragma mark -
#pragma mark generic code
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
+{
+ if (o_window && [o_window isVisible] && [o_window level] != i_level)
+ [o_window setLevel: i_level];
+}
+
- (IBAction)toggleWindow:(id)sender
{
if ([o_window isVisible])
[o_window orderOut:sender];
- else
+ else {
+ [o_window setLevel: [[[VLCMain sharedInstance] voutController] currentWindowLevel]];
[o_window makeKeyAndOrderFront:sender];
+ }
}
- (NSString *)generateProfileString
- (IBAction)viewPreferences:(id)sender
{
- NSInteger i_level = NSNormalWindowLevel;
- NSInteger i_video_window_level = [[[[VLCMainWindow sharedInstance] videoView] window] level];
- if (i_video_window_level == NSStatusWindowLevel)
- i_level = NSStatusWindowLevel;
+ NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentWindowLevel];
[[[VLCMain sharedInstance] simplePreferences] showSimplePrefsWithLevel:i_level];
}
}
[self makeFirstResponder: nil];
-
- if ([self level] != NSNormalWindowLevel)
- [self setLevel: NSNormalWindowLevel];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
// restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
[self setAlphaValue:1.0];
[self recreateHideMouseTimer];
i_originalLevel = [self level];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
[self setLevel:NSNormalWindowLevel];
if (b_dark_interface) {
- (void)windowWillExitFullScreen:(NSNotification *)notification
{
-
var_SetBool(pl_Get(VLCIntf), "fullscreen", false);
vout_thread_t *p_vout = getVout();
[o_video_view setFrame: [o_split_view frame]];
[NSCursor setHiddenUntilMouseMoves: NO];
[o_fspanel setNonActive: nil];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
[self setLevel:i_originalLevel];
+
b_fullscreen = NO;
if (b_dark_interface) {
/* generic */
+ (VLCTrackSynchronization *)sharedInstance;
+
+- (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (IBAction)toggleWindow:(id)sender;
- (IBAction)resetValues:(id)sender;
- (void)updateValues;
[self resetValues:self];
}
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
+{
+ if (o_window && [o_window isVisible] && [o_window level] != i_level)
+ [o_window setLevel: i_level];
+}
+
- (IBAction)toggleWindow:(id)sender
{
if ([o_window isVisible])
[o_window orderOut:sender];
- else
+ else {
+ [o_window setLevel: [[[VLCMain sharedInstance] voutController] currentWindowLevel]];
[o_window makeKeyAndOrderFront:sender];
+ }
}
- (IBAction)resetValues:(id)sender
NSMutableDictionary *o_vout_dict;
NSPoint top_left_point;
+
+ // save the status level if at least one video window is on status level
+ NSUInteger i_statusLevelWindowCounter;
+ NSInteger i_currentWindowLevel;
}
+@property (readonly, nonatomic) NSInteger currentWindowLevel;
+
- (VLCVoutView *)setupVoutForWindow:(vout_window_t *)p_wnd withProposedVideoViewPosition:(NSRect)videoViewPosition;
- (void)removeVoutforDisplay:(NSValue *)o_key;
- (void)updateWindow:(vout_window_t *)p_wnd withSelector:(SEL)aSel;
- (void)setNativeVideoSize:(NSSize)size forWindow:(vout_window_t *)p_wnd;
+- (void)setWindowLevel:(NSInteger)i_level forWindow:(vout_window_t *)p_wnd;
+
+- (void)updateWindowLevelForHelperWindows:(NSInteger)i_level;
@end
#import "MainWindow.h"
#import "VideoView.h"
+#import "VideoEffects.h"
+#import "AudioEffects.h"
+#import "playlistinfo.h"
+#import "bookmarks.h"
+#import "TrackSynchronization.h"
+
@implementation VLCVoutWindowController
- (id)init
{
self = [super init];
o_vout_dict = [[NSMutableDictionary alloc] init];
+ i_currentWindowLevel = NSNormalWindowLevel;
return self;
}
[o_new_video_window setNativeVideoSize:videoViewSize];
[o_new_video_window makeKeyAndOrderFront: self];
-
- vout_thread_t *p_vout = getVout();
- if (p_vout) {
- if (var_GetBool(p_vout, "video-on-top"))
- [o_new_video_window setLevel: NSStatusWindowLevel];
- else
- [o_new_video_window setLevel: NSNormalWindowLevel];
- vlc_object_release(p_vout);
- }
}
[o_new_video_window setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
[o_window setNativeVideoSize:size];
}
+- (void)setWindowLevel:(NSInteger)i_level forWindow:(vout_window_t *)p_wnd
+{
+ // only set level for helper windows to normal if no status vout window exist anymore
+ if(i_level == NSStatusWindowLevel) {
+ i_statusLevelWindowCounter++;
+ [self updateWindowLevelForHelperWindows:i_level];
+ } else {
+ i_statusLevelWindowCounter--;
+ if (i_statusLevelWindowCounter == 0) {
+ [self updateWindowLevelForHelperWindows:i_level];
+ }
+ }
+
+ VLCVideoWindowCommon *o_window = [o_vout_dict objectForKey:[NSValue valueWithPointer:p_wnd]];
+ if (!o_window) {
+ msg_Err(VLCIntf, "Cannot set size for nonexisting window");
+ return;
+ }
+
+ [o_window setWindowLevel:i_level];
+}
+
+- (void)updateWindowLevelForHelperWindows:(NSInteger)i_level
+{
+ if (var_InheritBool(VLCIntf, "video-wallpaper"))
+ return;
+
+ i_currentWindowLevel = i_level;
+
+ [[VLCMainWindow sharedInstance] setWindowLevel:i_level];
+ [[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:i_level];
+ [[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:i_level];
+ [[[VLCMain sharedInstance] info] updateCocoaWindowLevel:i_level];
+ [[VLCBookmarks sharedInstance] updateCocoaWindowLevel:i_level];
+ [[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:i_level];
+}
+
+@synthesize currentWindowLevel=i_currentWindowLevel;
+
+
@end
/* generic */
+ (VLCVideoEffects *)sharedInstance;
+- (void)updateCocoaWindowLevel:(NSInteger)i_level;
+
- (void)resetValues;
- (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on;
- (void)setVideoFilterProperty: (char *)psz_name forFilter: (char*)psz_filter integer: (int)i_value;
[self resetValues];
}
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
+{
+ if (o_window && [o_window isVisible] && [o_window level] != i_level)
+ [o_window setLevel: i_level];
+}
+
#pragma mark -
#pragma mark internal functions
- (void)resetProfileSelector
{
if ([o_window isVisible])
[o_window orderOut:sender];
- else
+ else {
+ [o_window setLevel: [[[VLCMain sharedInstance] voutController] currentWindowLevel]];
[o_window makeKeyAndOrderFront:sender];
+ }
}
- (IBAction)profileSelectorAction:(id)sender
@property (nonatomic, assign) VLCVoutView* videoView;
@property (readonly) VLCControlsBarCommon* controlsBar;
+- (void)setWindowLevel:(NSInteger)i_state;
+
- (void)resizeWindow;
- (void)setNativeVideoSize:(NSSize)size;
- (NSRect)getWindowRectForProposedVideoViewSize:(NSSize)size;
#pragma mark -
#pragma mark Video window resizing logic
+- (void)setWindowLevel:(NSInteger)i_state
+{
+ if (var_InheritBool(VLCIntf, "video-wallpaper") || [self level] < NSNormalWindowLevel)
+ return;
+
+ [self setLevel: i_state];
+
+}
+
- (NSRect)getWindowRectForProposedVideoViewSize:(NSSize)size
{
NSSize windowMinSize = [self minSize];
/* Make sure we don't see the window flashes in float-on-top mode */
i_originalLevel = [self level];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
[self setLevel:NSNormalWindowLevel];
+
/* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
if (!o_fullscreen_window) {
/* We can't change the styleMask of an already created NSWindow, so we create another window, and do eye catching stuff */
/* We always try to do so */
[NSScreen unblackoutScreens];
- vout_thread_t *p_vout = getVoutForActiveWindow();
- if (p_vout) {
- if (var_GetBool(p_vout, "video-on-top"))
- [[o_video_view window] setLevel: NSStatusWindowLevel];
- else
- [[o_video_view window] setLevel: NSNormalWindowLevel];
- vlc_object_release(p_vout);
- }
[[o_video_view window] makeKeyAndOrderFront: nil];
/* Don't do anything if o_fullscreen_window is already closed */
[o_fullscreen_window release];
o_fullscreen_window = nil;
+
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
[self setLevel:i_originalLevel];
[self setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
}
+ (VLCBookmarks *)sharedInstance;
+- (void)updateCocoaWindowLevel:(NSInteger)i_level;
+
- (IBAction)add:(id)sender;
- (IBAction)clear:(id)sender;
- (IBAction)edit:(id)sender;
[o_edit_lbl_bytes setStringValue: _NS("Position")];
}
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
+{
+ if (o_bookmarks_window && [o_bookmarks_window isVisible] && [o_bookmarks_window level] != i_level)
+ [o_bookmarks_window setLevel: i_level];
+}
+
- (void)showBookmarks
{
/* show the window, called from intf.m */
[o_bookmarks_window displayIfNeeded];
+ [o_bookmarks_window setLevel: [[[VLCMain sharedInstance] voutController] currentWindowLevel]];
[o_bookmarks_window makeKeyAndOrderFront:nil];
}
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
+ * David Fuhrmann <david dot fuhrmann at googlemail dot com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#import "SPMediaKeyTap.h" /* for the media key support */
#import "misc.h"
#import "MainWindow.h"
+#import "VLCVoutWindowController.h"
#import "StringUtility.h"
#import <IOKit/pwr_mgt/IOPMLib.h> /* for sleep prevention */
@class VLCEmbeddedWindow;
@class VLCControls;
@class VLCPlaylist;
-@class VLCVoutWindowController;
@interface VLCMain : NSObject <NSWindowDelegate, NSApplicationDelegate>
{
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan.org>
* Felix Paul Kühne <fkuehne at videolan dot org>
+ * David Fuhrmann <david dot fuhrmann at googlemail dot com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
msg_Err(p_wnd, "Mac OS X interface not found");
return VLC_EGENERIC;
}
-
NSRect proposedVideoViewPosition = NSMakeRect(cfg->x, cfg->y, cfg->width, cfg->height);
VLCVoutWindowController *o_vout_controller = [[VLCMain sharedInstance] voutController];
case VOUT_WINDOW_SET_STATE:
{
unsigned i_state = va_arg(args, unsigned);
- [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(setWindowLevel:) withObject:[NSNumber numberWithUnsignedInt:i_state] waitUntilDone:NO];
+
+ NSInteger i_cooca_level = NSNormalWindowLevel;
+ if (i_state & VOUT_WINDOW_STATE_ABOVE)
+ i_cooca_level = NSStatusWindowLevel;
+
+ SEL sel = @selector(setWindowLevel:forWindow:);
+ NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[[VLCMain sharedInstance] voutController] methodSignatureForSelector:sel]];
+ [inv setTarget:[[VLCMain sharedInstance] voutController]];
+ [inv setSelector:sel];
+ [inv setArgument:&i_cooca_level atIndex:2]; // starting at 2!
+ [inv setArgument:&p_wnd atIndex:3];
+ [inv performSelectorOnMainThread:@selector(invoke) withObject:nil
+ waitUntilDone:NO];
+
return VLC_SUCCESS;
}
case VOUT_WINDOW_SET_SIZE:
/* remove global observer watching for vout device changes correctly */
[[NSNotificationCenter defaultCenter] removeObserver: self];
+ // release before o_info!
+ [o_vout_controller release];
+ o_vout_controller = nil;
+
/* release some other objects here, because it isn't sure whether dealloc
* will be called later on */
if (o_sprefs)
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
- [o_mainmenu release];
- [o_vout_controller release];
- o_vout_controller = nil;
+ [o_mainmenu release];
libvlc_Quit(p_intf->p_libvlc);
#pragma mark -
#pragma mark Window updater
-- (void)setWindowLevel:(NSNumber*)state
-{
- if (var_InheritBool(p_intf, "video-wallpaper") || [[[[VLCMainWindow sharedInstance] videoView] window] level] < NSNormalWindowLevel)
- return;
- if ([state unsignedIntValue] & VOUT_WINDOW_STATE_ABOVE)
- [[[[VLCMainWindow sharedInstance] videoView] window] setLevel: NSStatusWindowLevel];
- else
- [[[[VLCMainWindow sharedInstance] videoView] window] setLevel: NSNormalWindowLevel];
-}
- (void)setActiveVideoPlayback:(BOOL)b_value
{
}
@property (readonly) input_item_t * item;
+- (void)updateCocoaWindowLevel:(NSInteger)i_level;
- (void)initPanel;
- (IBAction)metaFieldChanged:(id)sender;
[super dealloc];
}
+- (void)updateCocoaWindowLevel:(NSInteger)i_level
+{
+ if (o_info_window && [o_info_window isVisible] && [o_info_window level] != i_level)
+ [o_info_window setLevel: i_level];
+}
+
- (void)initPanel
{
b_stats = config_GetInt(VLCIntf, "stats");
else
[self initMediaPanelStats];
+ NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentWindowLevel];
+ [o_info_window setLevel: i_level];
[o_info_window makeKeyAndOrderFront: self];
}
projects / vlc / commitdiff