/*****************************************************************************
* vout.m: MacOS X video output module
*****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
#include "fspanel.h"
#include "vout.h"
#import "controls.h"
+#import "embeddedwindow.h"
/*****************************************************************************
* DeviceCallback: Callback triggered when the video-device variable is changed
- (BOOL)windowContainsEmbedded: (id)o_window
{
-/* if( ![[o_window className] isEqualToString: @"VLCWindow"] )
+/* if( ![[o_window className] isEqualToString: @"VLCVoutWindow"] )
{
- NSLog( @"We were not given a VLCWindow" );
+ NSLog( @"We were not given a VLCVoutWindow" );
}*/
return ([self getViewForWindow: o_window] == nil ? NO : YES );
}
(int)s_rect.size.width, (int)s_rect.size.height );
text.psz_string = psz_temp;
- val2.i_int = i;
+ val2.i_int = (int)[o_screen displayID];
var_Change( p_real_vout, "video-device",
VLC_VAR_ADDCHOICE, &val2, &text );
- if( i == i_device )
+ if( (int)[o_screen displayID] == i_device )
{
var_Set( p_real_vout, "video-device", val2 );
}
[o_view setFrameSize: [self frame].size];
}
+- (void)drawRect:(NSRect)rect
+{
+ /* When there is no subview we draw a black background */
+ [self lockFocus];
+ [[NSColor blackColor] set];
+ NSRectFill(rect);
+ [self unlockFocus];
+}
+
- (void)closeVout
{
[[[[VLCMain sharedInstance] getControls] getFSPanel] fadeOut];
+ /* Make sure we don't see a white flash */
+ [[self window] disableScreenUpdatesUntilFlush];
[o_view removeFromSuperview];
o_view = nil;
p_vout = NULL;
if( o_mrl != nil )
{
- /* FIXME once psz_access is exported, since that syntax is no longer valid */
-#if 0
- if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) )
- {
- NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
- if( prefix_range.location != NSNotFound )
- [o_mrl deleteCharactersInRange: prefix_range];
+ /* FIXME once psz_access is exported, we could check if we are
+ * reading from a file in a smarter way. */
+
+ NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
+ [o_mrl deleteCharactersInRange: prefix_range];
+
+ if( [o_mrl characterAtIndex:0] == '/' )
+ {
+ /* it's a local file */
[o_window setRepresentedFilename: o_mrl];
}
-#endif
+ else
+ {
+ /* it's from the network or somewhere else,
+ * we clear the previous path */
+ [o_window setRepresentedFilename: @""];
+ }
[o_window setTitle: o_title];
}
else
}
}
-- (void)scaleWindowWithFactor: (float)factor
+- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate
{
NSSize newsize;
int i_corrected_height, i_corrected_width;
if ( !p_vout->b_fullscreen )
{
+ NSView *mainView;
NSRect new_frame;
topleftbase.x = 0;
topleftbase.y = [o_window frame].size.height;
newsize.height = (int) ( i_corrected_height * factor );
}
+ /* In fullscreen mode we need to use a view that is different from
+ * ourselves, with the VLCEmbeddedWindow */
+ if([o_window isKindOfClass:[VLCEmbeddedWindow class]])
+ mainView = [o_window mainView];
+ else
+ mainView = self;
+
/* Calculate the window's new size */
new_frame.size.width = [o_window frame].size.width -
- [self frame].size.width + newsize.width;
+ [mainView frame].size.width + newsize.width;
new_frame.size.height = [o_window frame].size.height -
- [self frame].size.height + newsize.height;
+ [mainView frame].size.height + newsize.height;
new_frame.origin.x = topleftscreen.x;
new_frame.origin.y = topleftscreen.y - new_frame.size.height;
- [o_window setFrame: new_frame display: NO];
+ [o_window setFrame: new_frame display: animate animate: animate];
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
var_Get( p_real_vout, "fullscreen", &val );
val.b_bool = !val.b_bool;
var_Set( p_real_vout, "fullscreen", val );
- if( [self isFullscreen] )
- [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
- else
- [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
}
- (BOOL)isFullscreen
return o_return;
}
+- (void)enterFullscreen
+{
+ [[o_view class] resetVout: p_vout];
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
+}
+
+- (void)leaveFullscreen
+{
+ [[o_view class] resetVout: p_vout];
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
+}
+
@end
/*****************************************************************************
{
BOOL b_return = [super setVout: p_arg_vout subView: view frame:s_arg_frame];
i_time_mouse_last_moved = mdate();
- o_window = [[VLCWindow alloc] initWithVout: p_arg_vout view: self
+ o_window = [[VLCVoutWindow alloc] initWithVout: p_arg_vout view: self
frame: s_arg_frame];
[self updateTitle];
[view setFrame: [self frame]];
@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 setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
[self updateTitle];
- [self scaleWindowWithFactor: 1.0];
- [o_window makeKeyAndOrderFront: self];
+
+ if(!([o_window isFullscreen]))
+ [o_window makeKeyAndOrderFront: self];
+
+ NSLog(@"We are %s animating (%s)", [o_window isVisible] && (![o_window isFullscreen]) ? "" :"not", [o_window isFullscreen] ? "fullscreen" : "");
+
+ [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])];
}
return b_return;
}
- (void)closeVout
{
- [o_window orderOut: self];
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+
+ if(!playlist_IsPlaying( p_playlist ))
+ [o_window performSelectorOnMainThread: @selector(orderOut:) withObject: self waitUntilDone: YES];
+
+ vlc_object_release( p_playlist );
+
[super closeVout];
}
+- (void)enterFullscreen
+{
+ /* We are in a VLCEmbeddedWindow */
+ [o_embeddedwindow performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: YES];
+}
+
+- (void)leaveFullscreen
+{
+ /* We are in a VLCEmbeddedWindow */
+ [o_embeddedwindow performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: YES];
+}
@end
/*****************************************************************************
- * VLCWindow implementation
+ * VLCVoutWindow implementation
*****************************************************************************/
-@implementation VLCWindow
+@implementation VLCVoutWindow
- (id) initWithVout: (vout_thread_t *) vout view: (VLCVoutView *) view
frame: (NSRect *) frame
b_embedded = var_GetBool( p_vout, "macosx-embedded" );
/* Find out on which screen to open the window */
- if( i_device <= 0 || i_device > (int)[o_screens count] )
- {
- /* No preference specified. Use the main screen */
+ o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
+
+ if( !o_screen )
o_screen = [NSScreen mainScreen];
- i_device = [o_screens indexOfObject: o_screen];
- if( o_screen == [o_screens objectAtIndex: 0] )
- b_menubar_screen = VLC_TRUE;
- }
- else
- {
- i_device--;
- o_screen = [o_screens objectAtIndex: i_device];
- b_menubar_screen = ( i_device == 0 );
- }
+
+ if( o_screen == [NSScreen mainScreen] )
+ b_menubar_screen = VLC_TRUE;
if( p_vout->b_fullscreen )
{
defer: YES screen: o_screen];
if( b_black == VLC_TRUE )
- {
- CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
- CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, true );
- CGReleaseDisplayFadeReservation( token );
- unsigned int i;
- for( i = 0 ; i < [o_screens count]; i++)
- {
- struct
- {
- CGDirectDisplayID displayID;
- CGGammaValue redMin, redMax, redGamma,
- greenMin, greenMax, greenGamma,
- blueMin, blueMax, blueGamma;
- } dispSettings;
- CGDisplayCount dspyCnt;
- CGPoint gPoint;
-
- if( i == (unsigned int)i_device ) continue;
-
- screen_rect = [[o_screens objectAtIndex: i] frame];
-
- gPoint.x = screen_rect.origin.x;
- gPoint.y = screen_rect.origin.y;
- CGGetDisplaysWithPoint( gPoint, 1, &(dispSettings.displayID), &dspyCnt);
- CGGetDisplayTransferByFormula(
- dispSettings.displayID,
- &dispSettings.redMin, &dispSettings.redMax, &dispSettings.redGamma,
- &dispSettings.greenMin, &dispSettings.greenMax, &dispSettings.greenGamma,
- &dispSettings.blueMin, &dispSettings.blueMax, &dispSettings.blueGamma );
- CGSetDisplayTransferByFormula(
- dispSettings.displayID,
- dispSettings.redMin, 0, dispSettings.redGamma,
- dispSettings.greenMin, 0, dispSettings.greenGamma,
- dispSettings.blueMin, 0, dispSettings.blueGamma );
- }
- }
+ [o_screen blackoutOtherScreens];
+
if( b_menubar_screen )
{
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
projects / vlc / blobdiff