X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=9abf2a9ef694f1f0070e137345845ffba13e7586;hb=7dd8cdfd0ec842c21af56c705ddf8b7f14410455;hp=9418d85c1cb511c15d442cbdc1d8b89c38b35343;hpb=1e96bee0ce3c52f4774b605abcc818707ead8784;p=vlc diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 9418d85c1c..9abf2a9ef6 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1,13 +1,14 @@ /***************************************************************************** - * vout.m: MacOS X video output plugin + * vout.m: MacOS X video output module ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: vout.m,v 1.65 2003/11/15 22:42:16 hartman Exp $ + * Copyright (C) 2001-2005 VideoLAN + * $Id$ * * Authors: Colin Delacroix * Florian G. Pflug * Jon Lech Johansen - * Derk-Jan Hartman + * Derk-Jan Hartman + * Eric Petit * * 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 @@ -31,6 +32,7 @@ #include /* free() */ #include /* strerror() */ +/* BeginFullScreen, EndFullScreen */ #include #include @@ -38,719 +40,289 @@ #include "intf.h" #include "vout.h" -#define QT_MAX_DIRECTBUFFERS 10 -#define VL_MAX_DISPLAYS 16 - -struct picture_sys_t -{ - void *p_info; - unsigned int i_size; - - /* When using I420 output */ - PlanarPixmapInfoYUV420 pixmap_i420; -}; /***************************************************************************** - * Local prototypes + * DeviceCallback: Callback triggered when the video-device variable is changed *****************************************************************************/ +int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) +{ + vlc_value_t val; + vout_thread_t *p_vout = (vout_thread_t *)p_this; + + msg_Dbg( p_vout, "set %d", new_val.i_int ); + var_Create( p_vout->p_vlc, "video-device", VLC_VAR_INTEGER ); + var_Set( p_vout->p_vlc, "video-device", new_val ); + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val ); + return VLC_SUCCESS; +} -static int vout_Init ( vout_thread_t * ); -static void vout_End ( vout_thread_t * ); -static int vout_Manage ( vout_thread_t * ); -static void vout_Display ( vout_thread_t *, picture_t * ); - -static int CoSendRequest ( vout_thread_t *, SEL ); -static int CoCreateWindow ( vout_thread_t * ); -static int CoDestroyWindow ( vout_thread_t * ); -static int CoToggleFullscreen ( vout_thread_t * ); - -static void VLCHideMouse ( vout_thread_t *, BOOL ); - -static void QTScaleMatrix ( vout_thread_t * ); -static int QTCreateSequence ( vout_thread_t * ); -static void QTDestroySequence ( vout_thread_t * ); -static int QTNewPicture ( vout_thread_t *, picture_t * ); -static void QTFreePicture ( vout_thread_t *, picture_t * ); /***************************************************************************** - * OpenVideo: allocates MacOS X video thread output method - ***************************************************************************** - * This function allocates and initializes a MacOS X vout method. + * VLCWindow implementation *****************************************************************************/ -int E_(OpenVideo) ( vlc_object_t *p_this ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - OSErr err; - int i_timeout; - - p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); - if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); - return( 1 ); - } +@implementation VLCWindow - memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); +- (id)initWithVout:(vout_thread_t *)_p_vout frame:(NSRect *)s_frame +{ + NSAutoreleasePool *o_pool; + NSArray *o_screens = [NSScreen screens]; + NSScreen *o_screen; + vlc_bool_t b_menubar_screen = VLC_FALSE; + int i_timeout, i_device; + vlc_value_t value_drawable; - /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */ - for( i_timeout = 20 ; i_timeout-- ; ) - { - if( NSApp == NULL ) - { - msleep( INTF_IDLE_SLEEP ); - } - } + p_vout = _p_vout; - if( NSApp == NULL ) - { - /* no MacOS X intf, unable to communicate with MT */ - msg_Err( p_vout, "no MacOS X interface present" ); - free( p_vout->p_sys ); - return( 1 ); - } + var_Get( p_vout->p_vlc, "drawable", &value_drawable ); - if( [NSApp respondsToSelector: @selector(getIntf)] ) + /* 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 + * by examining the "drawable" value: if it's zero, we're running in the + * main Mac intf; if it's non-zero, we're embedded. */ + if( value_drawable.i_int == 0 ) { - intf_thread_t * p_intf; - - for( i_timeout = 10 ; i_timeout-- ; ) + /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */ + for( i_timeout = 20 ; i_timeout-- ; ) { - if( ( p_intf = [NSApp getIntf] ) == NULL ) + if( NSApp == NULL ) { msleep( INTF_IDLE_SLEEP ); } } - if( p_intf == NULL ) + if( NSApp == NULL ) { - msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" ); - free( p_vout->p_sys ); - return( 1 ); + /* No MacOS X intf, unable to communicate with MT */ + msg_Err( p_vout, "no MacOS X interface present" ); + return NULL; } } - - p_vout->p_sys->h_img_descr = - (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) ); - p_vout->p_sys->p_matrix = (MatrixRecordPtr)malloc( sizeof(MatrixRecord) ); - p_vout->p_sys->p_fullscreen_state = NULL; - - p_vout->p_sys->b_mouse_moved = VLC_TRUE; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - - /* set window size */ - p_vout->p_sys->s_rect.size.width = p_vout->i_window_width; - p_vout->p_sys->s_rect.size.height = p_vout->i_window_height; - - if( ( err = EnterMovies() ) != noErr ) - { - msg_Err( p_vout, "EnterMovies failed: %d", err ); - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return( 1 ); - } - - /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */ - vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock ); - - err = FindCodec( kYUV420CodecType, bestSpeedCodec, - nil, &p_vout->p_sys->img_dc ); - vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock ); - if( err == noErr && p_vout->p_sys->img_dc != 0 ) + if( [o_screens count] <= 0 ) { - p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); - p_vout->p_sys->i_codec = kYUV420CodecType; + msg_Err( p_vout, "no OSX screens available" ); + return NULL; + } + + /* p_real_vout: the vout we have to use to check for video-on-top + and a few other things. If we are the QuickTime output, it's us. + It we are the OpenGL provider, it is our parent. */ + if( p_vout->i_object_type == VLC_OBJECT_OPENGL ) + { + p_real_vout = (vout_thread_t *) p_vout->p_parent; } else { - msg_Err( p_vout, "failed to find an appropriate codec" ); + p_real_vout = p_vout; } - if( p_vout->p_sys->img_dc == 0 ) + p_fullscreen_state = NULL; + i_time_mouse_last_moved = mdate(); + + var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + + /* Get the pref value when this is the first time, otherwise retrieve the device from the top level video-device var */ + if( var_Type( p_real_vout->p_vlc, "video-device" ) == 0 ) { - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return VLC_EGENERIC; + i_device = var_GetInteger( p_vout, "macosx-vdev" ); + } + else + { + i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" ); } - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - NSArray * o_screens = [NSScreen screens]; - if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 ) + /* Setup the menuitem for the multiple displays. */ + if( var_Type( p_real_vout, "video-device" ) == 0 ) { int i = 1; - vlc_value_t val, text; + vlc_value_t val2, text; NSScreen * o_screen; - int i_option = config_GetInt( p_vout, "macosx-vdev" ); + var_Create( p_real_vout, "video-device", VLC_VAR_INTEGER | + VLC_VAR_HASCHOICE ); + text.psz_string = _("Video Device"); + var_Change( p_real_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL ); - var_Create( p_vout, "video-device", VLC_VAR_INTEGER | - VLC_VAR_HASCHOICE ); - text.psz_string = _("Video device"); - var_Change( p_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL ); - NSEnumerator * o_enumerator = [o_screens objectEnumerator]; + val2.i_int = 0; + text.psz_string = _("Default"); + var_Change( p_real_vout, "video-device", + VLC_VAR_ADDCHOICE, &val2, &text ); + var_Set( p_real_vout, "video-device", val2 ); + while( (o_screen = [o_enumerator nextObject]) != NULL ) { char psz_temp[255]; NSRect s_rect = [o_screen frame]; - snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1, + snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1, "%s %d (%dx%d)", _("Screen"), i, - (int)s_rect.size.width, (int)s_rect.size.height ); + (int)s_rect.size.width, (int)s_rect.size.height ); text.psz_string = psz_temp; - val.i_int = i; - var_Change( p_vout, "video-device", - VLC_VAR_ADDCHOICE, &val, &text ); - - if( ( i - 1 ) == i_option ) + val2.i_int = i; + var_Change( p_real_vout, "video-device", + VLC_VAR_ADDCHOICE, &val2, &text ); + if( i == i_device ) { - var_Set( p_vout, "video-device", val ); + var_Set( p_real_vout, "video-device", val2 ); } i++; } - var_AddCallback( p_vout, "video-device", vout_VarCallback, + var_AddCallback( p_real_vout, "video-device", DeviceCallback, NULL ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); + val2.b_bool = VLC_TRUE; + var_Set( p_real_vout, "intf-change", val2 ); } - [o_pool release]; - if( CoCreateWindow( p_vout ) ) + /* Find out on which screen to open the window */ + if( i_device <= 0 || i_device > (int)[o_screens count] ) { - msg_Err( p_vout, "unable to create window" ); - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return( 1 ); + /* No preference specified. Use the main screen */ + o_screen = [NSScreen mainScreen]; + if( o_screen == [o_screens objectAtIndex: 0] ) + b_menubar_screen = VLC_TRUE; } - - p_vout->pf_init = vout_Init; - p_vout->pf_end = vout_End; - p_vout->pf_manage = vout_Manage; - p_vout->pf_render = NULL; - p_vout->pf_display = vout_Display; - - return( 0 ); -} - -/***************************************************************************** - * vout_Init: initialize video thread output method - *****************************************************************************/ -static int vout_Init( vout_thread_t *p_vout ) -{ - int i_index; - picture_t *p_pic; - - I_OUTPUTPICTURES = 0; - - /* Initialize the output structure; we already found a codec, - * and the corresponding chroma we will be using. Since we can - * arbitrary scale, stick to the coordinates and aspect. */ - p_vout->output.i_width = p_vout->render.i_width; - p_vout->output.i_height = p_vout->render.i_height; - p_vout->output.i_aspect = p_vout->render.i_aspect; - - SetPort( p_vout->p_sys->p_qdport ); - QTScaleMatrix( p_vout ); - - if( QTCreateSequence( p_vout ) ) + else { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); + i_device--; + o_screen = [o_screens objectAtIndex: i_device]; + b_menubar_screen = ( i_device == 0 ); } - /* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */ - while( I_OUTPUTPICTURES < QT_MAX_DIRECTBUFFERS ) + o_pool = [[NSAutoreleasePool alloc] init]; + + if( p_vout->b_fullscreen ) { - p_pic = NULL; + NSRect screen_rect = [o_screen frame]; + screen_rect.origin.x = screen_rect.origin.y = 0; - /* Find an empty picture slot */ - for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ ) - { - if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE ) - { - p_pic = p_vout->p_picture + i_index; - break; - } - } + /* Creates a window with size: screen_rect on o_screen */ + [self initWithContentRect: screen_rect + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; - /* Allocate the picture */ - if( p_pic == NULL || QTNewPicture( p_vout, p_pic ) ) + if( b_menubar_screen ) { - break; + BeginFullScreen( &p_fullscreen_state, NULL, 0, 0, + NULL, NULL, fullScreenAllowEvents ); } - - p_pic->i_status = DESTROYED_PICTURE; - p_pic->i_type = DIRECT_PICTURE; - - PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; - - I_OUTPUTPICTURES++; - } - - return( 0 ); -} - -/***************************************************************************** - * vout_End: terminate video thread output method - *****************************************************************************/ -static void vout_End( vout_thread_t *p_vout ) -{ - int i_index; - - QTDestroySequence( p_vout ); - - /* Free the direct buffers we allocated */ - for( i_index = I_OUTPUTPICTURES; i_index; ) - { - i_index--; - QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] ); } -} - -/***************************************************************************** - * CloseVideo: destroy video thread output method - *****************************************************************************/ -void E_(CloseVideo) ( vlc_object_t *p_this ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - - if( CoDestroyWindow( p_vout ) ) + else { - msg_Err( p_vout, "unable to destroy window" ); - } - - if ( p_vout->p_sys->p_fullscreen_state != NULL ) - EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL ); - - ExitMovies(); - - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - - free( p_vout->p_sys ); -} + unsigned int i_stylemask = NSTitledWindowMask | + NSMiniaturizableWindowMask | + NSClosableWindowMask | + NSResizableWindowMask; -/***************************************************************************** - * vout_Manage: handle events - ***************************************************************************** - * This function should be called regularly by video output thread. It manages - * console events. It returns a non null value on error. - *****************************************************************************/ -static int vout_Manage( vout_thread_t *p_vout ) -{ - if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) - { - if( CoToggleFullscreen( p_vout ) ) + NSRect s_rect; + if( !s_frame ) { - return( 1 ); + s_rect.size.width = p_vout->i_window_width; + s_rect.size.height = p_vout->i_window_height; } - - p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; - } - - if( p_vout->i_changes & VOUT_SIZE_CHANGE ) - { - QTScaleMatrix( p_vout ); - SetDSequenceMatrix( p_vout->p_sys->i_seq, - p_vout->p_sys->p_matrix ); - - p_vout->i_changes &= ~VOUT_SIZE_CHANGE; - } - - /* hide/show mouse cursor - * this code looks unnecessarily complicated, but is necessary like this. - * it has to deal with multiple monitors and therefore checks a lot */ - if( !p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) - { - if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 3000000 ) + else { - VLCHideMouse( p_vout, YES ); + s_rect = *s_frame; } - } - else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) - { - VLCHideMouse( p_vout, NO ); - } - - /* disable screen saver */ - UpdateSystemActivity( UsrActivity ); - - return( 0 ); -} - -/***************************************************************************** - * vout_Display: displays previously rendered output - ***************************************************************************** - * This function sends the currently rendered image to the display. - *****************************************************************************/ -static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) -{ - OSErr err; - CodecFlags flags; - - if( ( err = DecompressSequenceFrameS( - p_vout->p_sys->i_seq, - p_pic->p_sys->p_info, - p_pic->p_sys->i_size, - codecFlagUseImageBuffer, &flags, nil ) != noErr ) ) - { - msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err ); - } - else - { - QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil ); - } -} + + [self initWithContentRect: s_rect + styleMask: i_stylemask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; -/***************************************************************************** - * CoSendRequest: send request to interface thread - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoSendRequest( vout_thread_t *p_vout, SEL sel ) -{ - int i_ret = 0; + [self setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; - VLCVout * o_vlv = [[VLCVout alloc] init]; + if( var_GetBool( p_real_vout, "video-on-top" ) ) + { + [self setLevel: NSStatusWindowLevel]; + } - if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) ) - { - msg_Err( p_vout, "SendRequest: no way to communicate with mt" ); + if( !s_frame ) + { + [self center]; + } } - [o_vlv release]; - - return( i_ret ); -} - -/***************************************************************************** - * CoCreateWindow: create new window - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoCreateWindow( vout_thread_t *p_vout ) -{ - if( CoSendRequest( p_vout, @selector(createWindow:) ) ) - { - msg_Err( p_vout, "CoSendRequest (createWindow) failed" ); - return( 1 ); - } + [self updateTitle]; + [self makeKeyAndOrderFront: nil]; + [self setReleasedWhenClosed: YES]; - return( 0 ); + /* We'll catch mouse events */ + [self setAcceptsMouseMovedEvents: YES]; + [self makeFirstResponder: self]; + + [o_pool release]; + return self; } -/***************************************************************************** - * CoDestroyWindow: destroy window - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoDestroyWindow( vout_thread_t *p_vout ) +- (void)close { - - VLCHideMouse( p_vout, NO ); - - if( CoSendRequest( p_vout, @selector(destroyWindow:) ) ) + if( p_fullscreen_state ) { - msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" ); - return( 1 ); + EndFullScreen( p_fullscreen_state, 0 ); } - - return( 0 ); + [super close]; } -/***************************************************************************** - * CoToggleFullscreen: toggle fullscreen - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoToggleFullscreen( vout_thread_t *p_vout ) +- (void)setOnTop:(BOOL)b_on_top { - QTDestroySequence( p_vout ); - - if( CoDestroyWindow( p_vout ) ) + if( b_on_top ) { - msg_Err( p_vout, "unable to destroy window" ); - return( 1 ); + [self setLevel: NSStatusWindowLevel]; } - - p_vout->b_fullscreen = !p_vout->b_fullscreen; - - config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen ); - - if( CoCreateWindow( p_vout ) ) + else { - msg_Err( p_vout, "unable to create window" ); - return( 1 ); + [self setLevel: NSNormalWindowLevel]; } - - SetPort( p_vout->p_sys->p_qdport ); - QTScaleMatrix( p_vout ); - - if( QTCreateSequence( p_vout ) ) - { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); - } - - return( 0 ); } -/***************************************************************************** - * VLCHideMouse: if b_hide then hide the cursor - *****************************************************************************/ -static void VLCHideMouse ( vout_thread_t *p_vout, BOOL b_hide ) +- (void)hideMouse:(BOOL)b_hide { BOOL b_inside; - NSRect s_rect; NSPoint ml; - NSWindow *o_window = p_vout->p_sys->o_window; - NSView *o_contents = [o_window contentView]; + NSView *o_contents = [self contentView]; - s_rect = [o_contents bounds]; - ml = [o_window convertScreenToBase:[NSEvent mouseLocation]]; + ml = [self convertScreenToBase:[NSEvent mouseLocation]]; ml = [o_contents convertPoint:ml fromView:nil]; - b_inside = [o_contents mouse: ml inRect: s_rect]; + b_inside = [o_contents mouse: ml inRect: [o_contents bounds]]; - if ( b_hide && b_inside ) + if( b_hide && b_inside ) { - /* only hide if mouse over VLCView */ [NSCursor setHiddenUntilMouseMoves: YES]; } - else if ( !b_hide ) + else if( !b_hide ) { [NSCursor setHiddenUntilMouseMoves: NO]; } - p_vout->p_sys->b_mouse_moved = NO; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - return; } -/***************************************************************************** - * QTScaleMatrix: scale matrix - *****************************************************************************/ -static void QTScaleMatrix( vout_thread_t *p_vout ) +- (void)manage { - Rect s_rect; - unsigned int i_width, i_height; - Fixed factor_x, factor_y; - unsigned int i_offset_x = 0; - unsigned int i_offset_y = 0; - - GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); - - i_width = s_rect.right - s_rect.left; - i_height = s_rect.bottom - s_rect.top; - - if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR ) + if( p_fullscreen_state ) { - int i_adj_width = i_height * p_vout->output.i_aspect / - VOUT_ASPECT_FACTOR; - - factor_x = FixDiv( Long2Fix( i_adj_width ), - Long2Fix( p_vout->output.i_width ) ); - factor_y = FixDiv( Long2Fix( i_height ), - Long2Fix( p_vout->output.i_height ) ); - - i_offset_x = (i_width - i_adj_width) / 2; + if( mdate() - i_time_mouse_last_moved > 3000000 ) + { + [self hideMouse: YES]; + } } else { - int i_adj_height = i_width * VOUT_ASPECT_FACTOR / - p_vout->output.i_aspect; - - factor_x = FixDiv( Long2Fix( i_width ), - Long2Fix( p_vout->output.i_width ) ); - factor_y = FixDiv( Long2Fix( i_adj_height ), - Long2Fix( p_vout->output.i_height ) ); - - i_offset_y = (i_height - i_adj_height) / 2; + [self hideMouse: NO]; } - - SetIdentityMatrix( p_vout->p_sys->p_matrix ); - - ScaleMatrix( p_vout->p_sys->p_matrix, - factor_x, factor_y, - Long2Fix(0), Long2Fix(0) ); - - TranslateMatrix( p_vout->p_sys->p_matrix, - Long2Fix(i_offset_x), - Long2Fix(i_offset_y) ); - -} - -/***************************************************************************** - * QTCreateSequence: create a new sequence - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int QTCreateSequence( vout_thread_t *p_vout ) -{ - OSErr err; - ImageDescriptionPtr p_descr; - - HLock( (Handle)p_vout->p_sys->h_img_descr ); - p_descr = *p_vout->p_sys->h_img_descr; - - p_descr->idSize = sizeof(ImageDescription); - p_descr->cType = p_vout->p_sys->i_codec; - p_descr->version = 1; - p_descr->revisionLevel = 0; - p_descr->vendor = 'appl'; - p_descr->width = p_vout->output.i_width; - p_descr->height = p_vout->output.i_height; - p_descr->hRes = Long2Fix(72); - p_descr->vRes = Long2Fix(72); - p_descr->spatialQuality = codecLosslessQuality; - p_descr->frameCount = 1; - p_descr->clutID = -1; - p_descr->dataSize = 0; - p_descr->depth = 24; - - HUnlock( (Handle)p_vout->p_sys->h_img_descr ); - - if( ( err = DecompressSequenceBeginS( - &p_vout->p_sys->i_seq, - p_vout->p_sys->h_img_descr, - NULL, 0, - p_vout->p_sys->p_qdport, - NULL, NULL, - p_vout->p_sys->p_matrix, - 0, NULL, - codecFlagUseImageBuffer, - codecLosslessQuality, - p_vout->p_sys->img_dc ) ) ) - { - msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err ); - return( 1 ); - } - - return( 0 ); -} - -/***************************************************************************** - * QTDestroySequence: destroy sequence - *****************************************************************************/ -static void QTDestroySequence( vout_thread_t *p_vout ) -{ - CDSequenceEnd( p_vout->p_sys->i_seq ); -} - -/***************************************************************************** - * QTNewPicture: allocate a picture - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) -{ - int i_width = p_vout->output.i_width; - int i_height = p_vout->output.i_height; - - /* We know the chroma, allocate a buffer which will be used - * directly by the decoder */ - p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); - - if( p_pic->p_sys == NULL ) - { - return( -1 ); - } - - switch( p_vout->output.i_chroma ) - { - case VLC_FOURCC('I','4','2','0'): - - p_pic->p_sys->p_info = (void *)&p_pic->p_sys->pixmap_i420; - p_pic->p_sys->i_size = sizeof(PlanarPixmapInfoYUV420); - - /* Allocate the memory buffer */ - p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, - 16, i_width * i_height * 3 / 2 ); - - /* Y buffer */ - p_pic->Y_PIXELS = p_pic->p_data; - p_pic->p[Y_PLANE].i_lines = i_height; - p_pic->p[Y_PLANE].i_pitch = i_width; - p_pic->p[Y_PLANE].i_pixel_pitch = 1; - p_pic->p[Y_PLANE].i_visible_pitch = i_width; - - /* U buffer */ - p_pic->U_PIXELS = p_pic->Y_PIXELS + i_height * i_width; - p_pic->p[U_PLANE].i_lines = i_height / 2; - p_pic->p[U_PLANE].i_pitch = i_width / 2; - p_pic->p[U_PLANE].i_pixel_pitch = 1; - p_pic->p[U_PLANE].i_visible_pitch = i_width / 2; - - /* V buffer */ - p_pic->V_PIXELS = p_pic->U_PIXELS + i_height * i_width / 4; - p_pic->p[V_PLANE].i_lines = i_height / 2; - p_pic->p[V_PLANE].i_pitch = i_width / 2; - p_pic->p[V_PLANE].i_pixel_pitch = 1; - p_pic->p[V_PLANE].i_visible_pitch = i_width / 2; - - /* We allocated 3 planes */ - p_pic->i_planes = 3; - -#define P p_pic->p_sys->pixmap_i420 - P.componentInfoY.offset = (void *)p_pic->Y_PIXELS - - p_pic->p_sys->p_info; - P.componentInfoCb.offset = (void *)p_pic->U_PIXELS - - p_pic->p_sys->p_info; - P.componentInfoCr.offset = (void *)p_pic->V_PIXELS - - p_pic->p_sys->p_info; - - P.componentInfoY.rowBytes = i_width; - P.componentInfoCb.rowBytes = i_width / 2; - P.componentInfoCr.rowBytes = i_width / 2; -#undef P - - break; - - default: - /* Unknown chroma, tell the guy to get lost */ - free( p_pic->p_sys ); - msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)", - p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma ); - p_pic->i_planes = 0; - return( -1 ); - } - - return( 0 ); -} - -/***************************************************************************** - * QTFreePicture: destroy a picture allocated with QTNewPicture - *****************************************************************************/ -static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) -{ - switch( p_vout->output.i_chroma ) - { - case VLC_FOURCC('I','4','2','0'): - free( p_pic->p_data_orig ); - break; - } - - free( p_pic->p_sys ); -} -/***************************************************************************** - * VLCWindow implementation - *****************************************************************************/ -@implementation VLCWindow - -- (void)setVout:(vout_thread_t *)_p_vout -{ - p_vout = _p_vout; -} - -- (vout_thread_t *)getVout -{ - return( p_vout ); + /* Disable screensaver */ + UpdateSystemActivity( UsrActivity ); } - (void)scaleWindowWithFactor: (float)factor @@ -766,18 +338,18 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) topleftbase.y = [self frame].size.height; topleftscreen = [self convertBaseToScreen: topleftbase]; - if( p_vout->output.i_height * p_vout->output.i_aspect > - p_vout->output.i_width * VOUT_ASPECT_FACTOR ) + if( p_vout->render.i_height * p_vout->render.i_aspect > + p_vout->render.i_width * VOUT_ASPECT_FACTOR ) { - i_corrected_width = p_vout->output.i_height * p_vout->output.i_aspect / + i_corrected_width = p_vout->render.i_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; newsize.width = (int) ( i_corrected_width * factor ); newsize.height = (int) ( p_vout->render.i_height * factor ); } else { - i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR / - p_vout->output.i_aspect; + i_corrected_height = p_vout->render.i_width * VOUT_ASPECT_FACTOR / + p_vout->render.i_aspect; newsize.width = (int) ( p_vout->render.i_width * factor ); newsize.height = (int) ( i_corrected_height * factor ); } @@ -791,33 +363,50 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)toggleFloatOnTop { - if( config_GetInt( p_vout, "macosx-float" ) ) + vlc_value_t val; + + if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool) { - config_PutInt( p_vout, "macosx-float", 0 ); - [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel]; + val.b_bool = VLC_FALSE; } else { - config_PutInt( p_vout, "macosx-float", 1 ); - [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; + val.b_bool = VLC_TRUE; } + var_Set( p_real_vout, "video-on-top", val ); } - (void)toggleFullscreen { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + vlc_value_t val; + var_Get( p_real_vout, "fullscreen", &val ); + val.b_bool = !val.b_bool; + var_Set( p_real_vout, "fullscreen", val ); } - (BOOL)isFullscreen { - return( p_vout->b_fullscreen ); + vlc_value_t val; + var_Get( p_real_vout, "fullscreen", &val ); + return( val.b_bool ); +} + +- (void)snapshot +{ + vout_Control( p_real_vout, VOUT_SNAPSHOT ); } - (BOOL)canBecomeKeyWindow { - return( YES ); + return YES; } +/* Sometimes crashes VLC.... +- (BOOL)performKeyEquivalent:(NSEvent *)o_event +{ + return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event]; +}*/ + - (void)keyDown:(NSEvent *)o_event { unichar key = 0; @@ -850,13 +439,9 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) } else if ( key == ' ' ) { - playlist_t *p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if ( p_playlist != NULL ) - { - playlist_Pause( p_playlist ); - vlc_object_release( p_playlist); - } + vlc_value_t val; + val.i_int = config_GetInt( p_vout, "key-play-pause" ); + var_Set( p_vout->p_vlc, "key-pressed", val ); } else { @@ -872,36 +457,46 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)updateTitle { - NSMutableString * o_title; - playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + NSMutableString * o_title,* o_mrl; + input_thread_t * p_input; - if( p_playlist == NULL ) + if( p_vout == NULL ) + { + return; + } + + p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, + FIND_PARENT ); + + if( p_input == NULL ) { return; } - vlc_mutex_lock( &p_playlist->object_lock ); - o_title = [NSMutableString stringWithUTF8String: - p_playlist->pp_items[p_playlist->i_index]->psz_uri]; - vlc_mutex_unlock( &p_playlist->object_lock ); - - vlc_object_release( p_playlist ); + if( p_input->input.p_item->psz_name != NULL ) + o_title = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_name]; + if( p_input->input.p_item->psz_uri != NULL ) + o_mrl = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_uri]; + if( o_title == nil ) + o_title = o_mrl; - if( o_title != nil ) + vlc_object_release( p_input ); + if( o_mrl != nil ) { - NSRange prefix_range = [o_title rangeOfString: @"file:"]; - if( prefix_range.location != NSNotFound ) + if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) ) { - [o_title deleteCharactersInRange: prefix_range]; + NSRange prefix_range = [o_mrl rangeOfString: @"file:"]; + if( prefix_range.location != NSNotFound ) + [o_mrl deleteCharactersInRange: prefix_range]; + [self setRepresentedFilename: o_mrl]; } - - [self setTitleWithRepresentedFilename: o_title]; + [self setTitle: o_title]; } else { - [self setTitle: - [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]]; + [self setTitle: [NSString stringWithCString: VOUT_TITLE]]; } } @@ -922,61 +517,29 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) return NO; } -@end - -/***************************************************************************** - * VLCView implementation - *****************************************************************************/ -@implementation VLCView - -- (void)drawRect:(NSRect)rect -{ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - [[NSColor blackColor] set]; - NSRectFill( rect ); - [super drawRect: rect]; - - p_vout->i_changes |= VOUT_SIZE_CHANGE; -} - - (BOOL)acceptsFirstResponder { - return( YES ); + return YES; } - (BOOL)becomeFirstResponder { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - [o_window setAcceptsMouseMovedEvents: YES]; - return( YES ); + return YES; } - (BOOL)resignFirstResponder { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - [o_window setAcceptsMouseMovedEvents: NO]; - VLCHideMouse( p_vout, NO ); - return( YES ); + /* We need to stay the first responder or we'll miss some + events */ + return NO; } - (void)mouseDown:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) - { + { case NSLeftMouseDown: { var_Get( p_vout, "mouse-button-down", &val ); @@ -984,7 +547,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseDown: o_event]; break; @@ -993,11 +556,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)otherMouseDown:(NSEvent *)o_event { - /* This is not the the wheel button. you need to poll the - * mouseWheel event for that. other is a third, forth or fifth button */ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) @@ -1009,7 +567,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseDown: o_event]; break; @@ -1018,9 +576,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)rightMouseDown:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) @@ -1032,7 +587,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseDown: o_event]; break; @@ -1041,9 +596,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)mouseUp:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) @@ -1053,13 +605,13 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) vlc_value_t b_val; b_val.b_bool = VLC_TRUE; var_Set( p_vout, "mouse-clicked", b_val ); - + var_Get( p_vout, "mouse-button-down", &val ); val.i_int &= ~1; var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseUp: o_event]; break; @@ -1068,9 +620,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)otherMouseUp:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) @@ -1082,7 +631,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseUp: o_event]; break; @@ -1091,9 +640,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)rightMouseUp:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; vlc_value_t val; switch( [o_event type] ) @@ -1105,7 +651,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) var_Set( p_vout, "mouse-button-down", val ); } break; - + default: [super mouseUp: o_event]; break; @@ -1114,189 +660,63 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) - (void)mouseDragged:(NSEvent *)o_event { - [self mouseMoved:o_event]; + [self mouseMoved: o_event]; } - (void)otherMouseDragged:(NSEvent *)o_event { - [self mouseMoved:o_event]; + [self mouseMoved: o_event]; } - (void)rightMouseDragged:(NSEvent *)o_event { - [self mouseMoved:o_event]; + [self mouseMoved: o_event]; } - (void)mouseMoved:(NSEvent *)o_event -{ +{ NSPoint ml; NSRect s_rect; BOOL b_inside; + NSView * o_view; - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; + i_time_mouse_last_moved = mdate(); - s_rect = [self bounds]; - ml = [self convertPoint: [o_event locationInWindow] fromView: nil]; - b_inside = [self mouse: ml inRect: s_rect]; + o_view = [self contentView]; + s_rect = [o_view bounds]; + ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil]; + b_inside = [o_view mouse: ml inRect: s_rect]; if( b_inside ) { vlc_value_t val; int i_width, i_height, i_x, i_y; - + vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width, (unsigned int)s_rect.size.height, &i_x, &i_y, &i_width, &i_height ); - val.i_int = ( ((int)ml.x) - i_x ) * + val.i_int = ( ((int)ml.x) - i_x ) * p_vout->render.i_width / i_width; var_Set( p_vout, "mouse-x", val ); - val.i_int = ( ((int)ml.y) - i_y ) * - p_vout->render.i_height / i_height; - var_Set( p_vout, "mouse-y", val ); - - val.b_bool = VLC_TRUE; - var_Set( p_vout, "mouse-moved", val ); - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - p_vout->p_sys->b_mouse_moved = YES; - } - - [super mouseMoved: o_event]; -} - -@end - -/***************************************************************************** - * VLCVout implementation - *****************************************************************************/ -@implementation VLCVout - -- (void)createWindow:(NSValue *)o_value -{ - vlc_value_t val; - VLCView * o_view; - NSScreen * o_screen; - vout_thread_t * p_vout; - vlc_bool_t b_main_screen; - - p_vout = (vout_thread_t *)[o_value pointerValue]; - - p_vout->p_sys->o_window = [VLCWindow alloc]; - [p_vout->p_sys->o_window setVout: p_vout]; - [p_vout->p_sys->o_window setReleasedWhenClosed: YES]; - - if( var_Get( p_vout, "video-device", &val ) < 0 ) - { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; - } - else - { - NSArray *o_screens = [NSScreen screens]; - unsigned int i_index = val.i_int; - - if( [o_screens count] < i_index ) + if( [[o_view className] isEqualToString: @"VLCGLView"] ) { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; + val.i_int = ( ((int)(s_rect.size.height - ml.y)) - i_y ) * + p_vout->render.i_height / i_height; } else { - i_index--; - o_screen = [o_screens objectAtIndex: i_index]; - config_PutInt( p_vout, "macosx-vdev", i_index ); - b_main_screen = (i_index == 0); - } - } - - if( p_vout->b_fullscreen ) - { - NSRect screen_rect = [o_screen frame]; - screen_rect.origin.x = screen_rect.origin.y = 0; - - if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL ) - BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0, - NULL, NULL, fullScreenAllowEvents ); - - [p_vout->p_sys->o_window - initWithContentRect: screen_rect - styleMask: NSBorderlessWindowMask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; - - //[p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1]; - p_vout->p_sys->b_mouse_moved = YES; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - } - else - { - unsigned int i_stylemask = NSTitledWindowMask | - NSMiniaturizableWindowMask | - NSClosableWindowMask | - NSResizableWindowMask; - - if ( p_vout->p_sys->p_fullscreen_state != NULL ) - EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL ); - p_vout->p_sys->p_fullscreen_state = NULL; - - [p_vout->p_sys->o_window - initWithContentRect: p_vout->p_sys->s_rect - styleMask: i_stylemask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; - - [p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )]; - - if( config_GetInt( p_vout, "macosx-float" ) ) - { - [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; - } - - if( !p_vout->p_sys->b_pos_saved ) - { - [p_vout->p_sys->o_window center]; + val.i_int = ( ((int)ml.y) - i_y ) * + p_vout->render.i_height / i_height; } + var_Set( p_vout, "mouse-y", val ); + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "mouse-moved", val ); } - o_view = [[VLCView alloc] init]; - /* FIXME: [o_view setMenu:] */ - [p_vout->p_sys->o_window setContentView: o_view]; - [o_view autorelease]; - - [o_view lockFocus]; - p_vout->p_sys->p_qdport = [o_view qdPort]; - - [o_view unlockFocus]; - - [p_vout->p_sys->o_window updateTitle]; - [p_vout->p_sys->o_window makeKeyAndOrderFront: nil]; -} - -- (void)destroyWindow:(NSValue *)o_value -{ - vout_thread_t * p_vout; - - p_vout = (vout_thread_t *)[o_value pointerValue]; - - if( !p_vout->b_fullscreen ) - { - NSRect s_rect; - - s_rect = [[p_vout->p_sys->o_window contentView] frame]; - p_vout->p_sys->s_rect.size = s_rect.size; - - s_rect = [p_vout->p_sys->o_window frame]; - p_vout->p_sys->s_rect.origin = s_rect.origin; - - p_vout->p_sys->b_pos_saved = YES; - } - - p_vout->p_sys->p_qdport = nil; - [p_vout->p_sys->o_window close]; - p_vout->p_sys->o_window = nil; + [super mouseMoved: o_event]; } @end