X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=bdda538bf230ee4b1903bda306fd3cafeae2b305;hb=79559bdf7ff37fb54364a3ef7917b1e5481dc4c2;hp=781533108012b2a4cf5e5377b4d647d5289a191d;hpb=94f061cd0677ce67db817072a3bbf77a64da32e7;p=vlc diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 7815331080..bdda538bf2 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1,7 +1,7 @@ /***************************************************************************** * vout.m: MacOS X video output module ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team + * Copyright (C) 2001-2008 the VideoLAN team * $Id$ * * Authors: Colin Delacroix @@ -10,7 +10,7 @@ * Derk-Jan Hartman * Eric Petit * Benjamin Pracht - * Felix KŸhne + * Felix Paul Kühne * * 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 @@ -32,7 +32,7 @@ *****************************************************************************/ #include /* ENOMEM */ #include /* free() */ -#include /* strerror() */ +#include /* BeginFullScreen, EndFullScreen */ #include @@ -58,7 +58,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, var_Create( p_vout->p_libvlc, "video-device", VLC_VAR_INTEGER ); var_Set( p_vout->p_libvlc, "video-device", new_val ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); return VLC_SUCCESS; } @@ -143,7 +143,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, *****************************************************************************/ @implementation VLCVoutView -- (id)initWithFrame:(NSRect)frameRect +- (id)initWithFrame: (NSRect)frameRect { [super initWithFrame: frameRect]; p_vout = NULL; @@ -155,8 +155,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return self; } -- (BOOL)setVout: (vout_thread_t *) vout subView: (NSView *) view - frame: (NSRect *) frame +- (BOOL)setVout: (vout_thread_t *) vout + subView: (NSView *) view + frame: (NSRect *) frame { int i_device; NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; @@ -193,7 +194,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, var_Create( p_real_vout, "video-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); - text.psz_string = _("Video Device"); + text.psz_string = _("Fullscreen Video Device"); var_Change( p_real_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL ); NSEnumerator * o_enumerator = [o_screens objectEnumerator]; @@ -227,7 +228,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, var_AddCallback( p_real_vout, "video-device", DeviceCallback, NULL ); - val2.b_bool = VLC_TRUE; + val2.b_bool = true; var_Set( p_real_vout, "intf-change", val2 ); } @@ -265,33 +266,39 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, p_vout = NULL; s_frame = nil; o_window = nil; - p_real_vout = NULL; + p_real_vout = NULL; } - (void)updateTitle { - NSMutableString * o_title = nil, * o_mrl = nil; + NSString * o_title = nil; + NSMutableString * o_mrl = nil; input_thread_t * p_input; + char * psz_title; - if( p_vout == NULL ) - { - return; - } + if( !p_vout ) return; p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT ); - if( p_input == NULL ) - { - return; - } + if( !p_input ) return; + + input_item_t * p_item = input_GetItem( p_input ); + + psz_title = input_item_GetNowPlaying ( p_item ); + if( !psz_title ) + psz_title = input_item_GetName( p_item ); + + if( psz_title ) + o_title = [NSString stringWithUTF8String: psz_title]; - if( input_GetItem(p_input)->psz_name != NULL ) - o_title = [NSMutableString stringWithUTF8String: - input_GetItem(p_input)->psz_name]; - if( input_GetItem(p_input)->psz_uri != NULL ) - o_mrl = [NSMutableString stringWithUTF8String: - input_GetItem(p_input)->psz_uri]; - if( o_title == nil ) + char *psz_uri = input_item_GetURI( p_item ); + if( psz_uri ) + o_mrl = [NSMutableString stringWithUTF8String: psz_uri]; + + free( psz_title ); + free( psz_uri ); + + if( !o_title ) o_title = o_mrl; if( o_mrl != nil ) @@ -304,7 +311,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [o_mrl deleteCharactersInRange: prefix_range]; if( [o_mrl characterAtIndex:0] == '/' ) - { + { /* it's a local file */ [o_window setRepresentedFilename: o_mrl]; } @@ -318,7 +325,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, } else { - [o_window setTitle: [NSString stringWithCString: VOUT_TITLE]]; + [o_window setTitle: [NSString stringWithUTF8String: VOUT_TITLE]]; } vlc_object_release( p_input ); } @@ -396,11 +403,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if( !p_real_vout ) return; if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool) { - val.b_bool = VLC_FALSE; + val.b_bool = false; } else { - val.b_bool = VLC_TRUE; + val.b_bool = true; } var_Set( p_real_vout, "video-on-top", val ); } @@ -417,6 +424,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (BOOL)isFullscreen { vlc_value_t val; + if( !p_real_vout ) return NO; var_Get( p_real_vout, "fullscreen", &val ); return( val.b_bool ); } @@ -429,6 +437,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (void)manage { /* Disable Screensaver, when we're playing something, but allow it on pause */ + if( !VLCIntf || !VLCIntf->p_sys || !VLCIntf->p_sys->i_play_status ) + return; + if( VLCIntf->p_sys->i_play_status == PLAYING_S ) UpdateSystemActivity( UsrActivity ); } @@ -438,6 +449,12 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return o_window; } +- (void)scrollWheel:(NSEvent *)theEvent +{ + VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls]; + [o_controls scrollWheel: theEvent]; +} + - (void)keyDown:(NSEvent *)o_event { unichar key = 0; @@ -552,7 +569,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if( p_vout && [o_event type] == NSLeftMouseUp ) { vlc_value_t b_val; - b_val.b_bool = VLC_TRUE; + b_val.b_bool = true; var_Set( p_vout, "mouse-clicked", b_val ); var_Get( p_vout, "mouse-button-down", &val ); @@ -583,7 +600,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, { /* FIXME: this isn't the appropriate place, but we can't receive * NSRightMouseDown some how */ - msg_Dbg( p_vout, "received NSRightMouseUp" ); + msg_Dbg( p_vout, "received NSRightMouseUp" ); [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; } @@ -642,7 +659,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, } var_Set( p_vout, "mouse-y", val ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "mouse-moved", val ); } if( [self isFullscreen] ) @@ -701,8 +718,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, "macosx-embedded", 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 @@ -729,7 +745,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, "embedded-video") ) { o_return = [[[VLCMain sharedInstance] getEmbeddedList] getEmbeddedVout]; @@ -750,14 +766,18 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (void)enterFullscreen { - [[o_view class] resetVout: p_vout]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; + /* Save the settings for next playing item */ + playlist_t * p_playlist = pl_Yield( p_real_vout ); + var_SetBool( p_playlist, "fullscreen", true ); + pl_Release( p_real_vout ); } - (void)leaveFullscreen { - [[o_view class] resetVout: p_vout]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; + /* Save the settings for next playing item */ + playlist_t * p_playlist = pl_Yield( p_real_vout ); + var_SetBool( p_playlist, "fullscreen", false ); + pl_Release( p_real_vout ); } @end @@ -789,7 +809,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [o_window setLevel: NSStatusWindowLevel]; } - [o_window setAcceptsMouseMovedEvents: TRUE]; return b_return; } @@ -831,9 +850,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (void)manage { [super manage]; + unsigned int i_mouse_hide_timeout = + var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; if( p_vout->b_fullscreen ) { - if( mdate() - i_time_mouse_last_moved > 3000000 ) + if( mdate() - i_time_mouse_last_moved > i_mouse_hide_timeout ) { [self hideMouse: YES]; } @@ -844,6 +865,33 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, } } + +- (void)enterFullscreen +{ + [super enterFullscreen]; + + if( var_GetBool( p_real_vout, "video-on-top" ) ) + { + [o_window setLevel: NSNormalWindowLevel]; + } + + [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; +} + +- (void)leaveFullscreen +{ + [super leaveFullscreen]; + + if( var_GetBool( p_real_vout, "video-on-top" ) ) + { + [o_window setLevel: NSStatusWindowLevel]; + } + + [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; +} + @end /***************************************************************************** @@ -852,24 +900,34 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, @implementation VLCEmbeddedVoutView +- (void)awakeFromNib +{ + o_embeddedwindow = [self window]; +} + - (id)initWithFrame: (NSRect)frameRect { - [super initWithFrame: frameRect]; - b_used = NO; - [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; + if(self = [super initWithFrame: frameRect]) + { + b_used = NO; + [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; + o_embeddedwindow = nil; /* Filled later on in -awakeFromNib */ + } return self; } - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - frame: (NSRect *) s_arg_frame - + frame: (NSRect *)s_arg_frame { BOOL b_return; + + [NSObject cancelPreviousPerformRequestsWithTarget:o_window]; + b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; if( b_return ) { o_window = [self window]; - [o_window makeKeyAndOrderFront: self]; + [o_window setAcceptsMouseMovedEvents: TRUE]; if( var_GetBool( p_real_vout, "video-on-top" ) ) @@ -879,79 +937,76 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [view setFrameSize: [self frame].size]; } - return b_return; -} - -- (void)setUsed: (BOOL)b_new_used -{ - b_used = b_new_used; -} - -- (BOOL)isUsed -{ - return b_used; -} - -- (void)closeVout -{ - [super closeVout]; - [o_window setAcceptsMouseMovedEvents: NO]; - [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self]; -} - - -@end - -@implementation VLCDetachedEmbeddedVoutView -- (void)awakeFromNib -{ - o_embeddedwindow = [self window]; -} - -- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - frame: (NSRect *) s_arg_frame -{ - BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; /* o_window needs to point to our o_embeddedwindow, super might have set it * to the fullscreen window that o_embeddedwindow setups during fullscreen */ o_window = o_embeddedwindow; - + if( b_return ) { + [o_window lockFullscreenAnimation]; + [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; + [self updateTitle]; - if(!([o_window isFullscreen])) - [o_window makeKeyAndOrderFront: self]; + [NSObject cancelPreviousPerformRequestsWithTarget:o_window]; - NSLog(@"We are %s animating (%s)", [o_window isVisible] && (![o_window isFullscreen]) ? "" :"not", [o_window isFullscreen] ? "fullscreen" : ""); + /* Make the window the front and key window before animating */ + if ([o_window isVisible] && (![o_window isFullscreen])) + [o_window makeKeyAndOrderFront: self]; [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])]; + + [o_window setAspectRatio:NSMakeSize([o_window frame].size.width, [o_window frame].size.height)]; + + /* Make sure our window is visible, if we are not in fullscreen */ + if (![o_window isFullscreen]) + [o_window makeKeyAndOrderFront: self]; + [o_window unlockFullscreenAnimation]; + } + return b_return; } -- (void)closeVout +- (void)setUsed: (BOOL)b_new_used { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + b_used = b_new_used; +} - if(!playlist_IsPlaying( p_playlist )) - [o_window performSelectorOnMainThread: @selector(orderOut:) withObject: self waitUntilDone: YES]; - - vlc_object_release( p_playlist ); +- (BOOL)isUsed +{ + return b_used; +} +- (void)closeVout +{ [super closeVout]; + + /* Don't close the window yet, wait a bit to see if a new input is poping up */ + /* FIXME: Probably fade the window In and Out */ + /* FIXME: fix core */ + [o_embeddedwindow performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5]; + + [o_window setAcceptsMouseMovedEvents: NO]; + [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self]; } - (void)enterFullscreen { + /* Save settings */ + [super enterFullscreen]; + /* We are in a VLCEmbeddedWindow */ [o_embeddedwindow performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: YES]; } - (void)leaveFullscreen { + /* Save settings */ + [super leaveFullscreen]; + /* We are in a VLCEmbeddedWindow */ [o_embeddedwindow performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: YES]; } @@ -969,7 +1024,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, o_view = view; s_frame = frame; - [self performSelectorOnMainThread: @selector(initReal:) + [self performSelectorOnMainThread: @selector(initMainThread:) withObject: NULL waitUntilDone: YES]; if( !b_init_ok ) @@ -980,20 +1035,20 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return self; } -- (id)initReal: (id) sender +- (id)initMainThread: (id) sender { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSArray *o_screens = [NSScreen screens]; NSScreen *o_screen; - vlc_bool_t b_menubar_screen = VLC_FALSE; + bool b_menubar_screen = false; int i_device; - b_init_ok = VLC_FALSE; + b_init_ok = false; p_real_vout = [VLCVoutView getRealVout: p_vout]; i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" ); - b_black = var_GetBool( p_vout, "macosx-black" ); - b_embedded = var_GetBool( p_vout, "macosx-embedded" ); + b_black = NO; + b_embedded = var_GetBool( p_vout, "embedded-video" ); /* Find out on which screen to open the window */ o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device]; @@ -1001,8 +1056,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if( !o_screen ) o_screen = [NSScreen mainScreen]; - if( o_screen == [NSScreen mainScreen] ) - b_menubar_screen = VLC_TRUE; + if( [o_screen isMainScreen] ) + b_menubar_screen = true; if( p_vout->b_fullscreen ) { @@ -1010,11 +1065,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, NSRect screen_rect = [o_screen frame]; screen_rect.origin.x = screen_rect.origin.y = 0; + b_black = var_GetBool( p_vout, "macosx-black" ); + /* move the FSPanel to front in case that it is currently shown * this won't and is not supposed to work when it's fading right now */ if( [[[[VLCMain sharedInstance] getControls] getFSPanel] isDisplayed] ) - [[[[VLCMain sharedInstance] getControls] getFSPanel] orderFront: self]; - + [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; + /* tell the fspanel to move itself to front next time it's triggered */ [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device]; @@ -1023,18 +1080,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, styleMask: NSBorderlessWindowMask backing: NSBackingStoreBuffered defer: YES screen: o_screen]; - - if( b_black == VLC_TRUE ) - [o_screen blackoutOtherScreens]; - + if( b_menubar_screen ) { SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); } - if( b_black == VLC_TRUE ) + if( b_black == true ) { CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); - CGDisplayFade( token, 2 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGDisplayFade( token, 0.6 , kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); + + [o_screen blackoutOtherScreens]; + + CGDisplayFade( token, 0.3 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO ); CGReleaseDisplayFadeReservation( token); } } @@ -1093,7 +1151,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [o_pool release]; - b_init_ok = VLC_TRUE; + b_init_ok = true; return self; } @@ -1106,25 +1164,31 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, { /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting Command-Q */ - [self setContentView: NULL]; - [self performSelectorOnMainThread: @selector(closeReal:) + [self performSelectorOnMainThread: @selector(closeMainThread:) withObject: NULL waitUntilDone: NO]; } -- (id)closeReal:(id)sender +- (id)closeMainThread:(id)sender { - if( b_black == VLC_TRUE ) + if( b_black == true ) { CGDisplayFadeReservationToken token; CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); - CGDisplayFade( token, 2, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGDisplayFade( token, 0.3 , kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); + + [self disableScreenUpdatesUntilFlush]; + [self orderOut: self]; + + CGDisplayFade( token, 0.6 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, YES ); CGReleaseDisplayFadeReservation( token); CGDisplayRestoreColorSyncSettings(); } + [NSScreen unblackoutScreens]; + SetSystemUIMode( kUIModeNormal, 0); [super close]; /* this does only work in embedded mode */ - if( b_embedded == VLC_TRUE ) + if( b_embedded == true ) [[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self]; return NULL; @@ -1150,8 +1214,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (BOOL)windowShouldClose:(id)sender { - playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_vout ); if( p_playlist == NULL ) { return NO; @@ -1164,5 +1227,4 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return NO; } - @end