X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=2ac420181cf255ce16312204e2022e17a3402454;hb=94cdda13e8bbf6a3bccbaf2d81b424e61050e2d9;hp=892816f85e97816a6478f0ce8fd85ec52c9151dd;hpb=12a7ff08cc2b4bf5c509fc5cce3090481c73769c;p=vlc diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 892816f85e..2ac420181c 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.19 2003/01/25 12:00:38 hartman Exp $ + * $Id$ * * Authors: Colin Delacroix * Florian G. Pflug * Jon Lech Johansen * 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,18 +32,23 @@ #include /* free() */ #include /* strerror() */ -#include -#include -#include -#include - -#include #include +#include +#include +#include + +#include + #include "intf.h" #include "vout.h" #define QT_MAX_DIRECTBUFFERS 10 +#define VL_MAX_DISPLAYS 16 + +#define OPENGL_EFFECT_NONE 1 +#define OPENGL_EFFECT_CUBE 2 +#define OPENGL_EFFECT_TRANSPARENT_CUBE 4 struct picture_sys_t { @@ -56,21 +62,24 @@ struct picture_sys_t /***************************************************************************** * Local prototypes *****************************************************************************/ -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 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 * ); + +static int InitVideo ( vout_thread_t * ); +static void EndVideo ( vout_thread_t * ); +static int ManageVideo ( vout_thread_t * ); +static void DisplayVideo ( vout_thread_t *, picture_t * ); +static int ControlVideo ( vout_thread_t *, int, va_list ); + +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 @@ -80,6 +89,7 @@ static void QTFreePicture ( vout_thread_t *, picture_t * ); int E_(OpenVideo) ( vlc_object_t *p_this ) { vout_thread_t * p_vout = (vout_thread_t *)p_this; + vlc_value_t val; OSErr err; int i_timeout; @@ -103,55 +113,78 @@ int E_(OpenVideo) ( vlc_object_t *p_this ) 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 ); } - if( [NSApp respondsToSelector: @selector(getIntf)] ) - { - intf_thread_t * p_intf; - - for( i_timeout = 10 ; i_timeout-- ; ) - { - if( ( p_intf = [NSApp getIntf] ) == NULL ) - { - msleep( INTF_IDLE_SLEEP ); - } - } - - if( p_intf == NULL ) - { - msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" ); - free( p_vout->p_sys ); - return( 1 ); - } - } - - 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->pf_init = InitVideo; + p_vout->pf_end = EndVideo; + p_vout->pf_manage = ManageVideo; + p_vout->pf_render = NULL; + p_vout->pf_display = DisplayVideo; + p_vout->pf_control = ControlVideo; - p_vout->p_sys->b_mouse_pointer_visible = 1; + p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; + p_vout->p_sys->b_mouse_moved = VLC_TRUE; + p_vout->p_sys->i_time_mouse_last_moved = mdate(); - /* set window size */ + /* set original 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 ); - } + var_Create( p_vout, "macosx-vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + 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 ); + var_Create( p_vout, "macosx-opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + + /* Check if we should use QuickTime or OpenGL */ + var_Get( p_vout, "macosx-vout", &val); - if( vout_ChromaCmp( p_vout->render.i_chroma, VLC_FOURCC('I','4','2','0') ) ) + if( !strncmp( val.psz_string, "auto", 4 ) ) + { + p_vout->p_sys->i_opengl = CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ); + } + else if( !strncmp( val.psz_string, "opengl", 6 ) ) { + p_vout->p_sys->i_opengl = VLC_TRUE; + } + else + { + p_vout->p_sys->i_opengl = VLC_FALSE; + } + free( val.psz_string ); + + if( !p_vout->p_sys->i_opengl ) + { + /* Initialize QuickTime */ + 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; + + 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 VLC_EGENERIC; + } + + /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */ + vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock ); + + /* Can we find the right chroma ? */ err = FindCodec( kYUV420CodecType, bestSpeedCodec, - nil, &p_vout->p_sys->img_dc ); + 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 ) { p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); @@ -161,34 +194,37 @@ int E_(OpenVideo) ( vlc_object_t *p_this ) { msg_Err( p_vout, "failed to find an appropriate codec" ); } + + if( p_vout->p_sys->img_dc == 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; + } + msg_Dbg( p_vout, "using Quartz mode" ); } else { - msg_Err( p_vout, "chroma 0x%08x not supported", - p_vout->render.i_chroma ); + p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); + msg_Dbg( p_vout, "using OpenGL mode" ); } - if( p_vout->p_sys->img_dc == 0 ) - { - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return( 1 ); - } - - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + /* Setup the menuitem for the multiple displays. Read the vlc preference (macosx-vdev) for the primary display */ NSArray * o_screens = [NSScreen screens]; if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 ) { int i = 1; - vlc_value_t val; + vlc_value_t val2, text; NSScreen * o_screen; - int i_option = config_GetInt( p_vout, "macosx-vdev" ); + var_Get( p_vout, "macosx-vdev", &val ); - var_Create( p_vout, "video-device", VLC_VAR_STRING | + 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]; while( (o_screen = [o_enumerator nextObject]) != NULL ) @@ -200,51 +236,82 @@ int E_(OpenVideo) ( vlc_object_t *p_this ) "%s %d (%dx%d)", _("Screen"), i, (int)s_rect.size.width, (int)s_rect.size.height ); - val.psz_string = psz_temp; - var_Change( p_vout, "video-device", VLC_VAR_ADDCHOICE, &val ); + text.psz_string = psz_temp; + val2.i_int = i; + var_Change( p_vout, "video-device", + VLC_VAR_ADDCHOICE, &val2, &text ); - if( ( i - 1 ) == i_option ) + if( ( i - 1 ) == val.i_int ) { - var_Set( p_vout, "video-device", val ); + var_Set( p_vout, "video-device", val2 ); } - i++; } var_AddCallback( p_vout, "video-device", vout_VarCallback, NULL ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); + val2.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val2 ); } - [o_pool release]; + /* Spawn window */ if( CoCreateWindow( p_vout ) ) { - msg_Err( p_vout, "unable to create window" ); - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); + msg_Err( p_vout, "unable to create a window" ); + if( !p_vout->p_sys->i_opengl ) + { + free( p_vout->p_sys->p_matrix ); + DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); + } free( p_vout->p_sys ); - return( 1 ); + return VLC_EGENERIC; } - 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 ); + return VLC_SUCCESS; } /***************************************************************************** - * vout_Init: initialize video thread output method + * CloseVideo: destroy video thread output method *****************************************************************************/ -static int vout_Init( vout_thread_t *p_vout ) +void E_(CloseVideo) ( vlc_object_t *p_this ) { - int i_index; - picture_t *p_pic; + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; + vout_thread_t * p_vout = (vout_thread_t *)p_this; + + if( CoDestroyWindow( p_vout ) ) + { + 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 ); + } + + if( !p_vout->p_sys->i_opengl ) + { + /* Clean Up Quicktime environment */ + ExitMovies(); + free( p_vout->p_sys->p_matrix ); + DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); + } + else + { + [p_vout->p_sys->o_glview cleanUp]; + } + + [o_pool release]; + free( p_vout->p_sys ); +} + +/***************************************************************************** + * InitVideo: initialize video thread output method + *****************************************************************************/ +static int InitOpenGL ( vout_thread_t *p_vout ); +static int InitQuickTime( vout_thread_t *p_vout ); +static int InitVideo ( vout_thread_t *p_vout ) +{ I_OUTPUTPICTURES = 0; /* Initialize the output structure; we already found a codec, @@ -254,6 +321,86 @@ static int vout_Init( vout_thread_t *p_vout ) p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + if( p_vout->p_sys->i_opengl ) + { + return InitOpenGL( p_vout ); + } + else + { + return InitQuickTime( p_vout ); + } +} + +static int InitOpenGL( vout_thread_t *p_vout ) +{ + picture_t *p_pic = NULL; + int i_bytes; + int i_index; + + /* Apple OpenGL extensions only accept YUV as YUY2 */ + p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); + p_vout->output.i_rmask = 0xFF0000; + p_vout->output.i_gmask = 0x00FF00; + p_vout->output.i_bmask = 0x0000FF; + + /* Allocate our 2 picture buffers */ + i_bytes = 2 * p_vout->output.i_width * p_vout->output.i_height; + p_vout->p_sys->p_data[0] = vlc_memalign( + &p_vout->p_sys->p_data_orig[0], 16, i_bytes ); + p_vout->p_sys->p_data[1] = vlc_memalign( + &p_vout->p_sys->p_data_orig[1], 16, i_bytes ); + p_vout->p_sys->i_cur_pic = 1; + + /* We declare only one picture and will switch buffers manually */ + while( I_OUTPUTPICTURES < 1 ) + { + /* 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; + } + } + if( p_pic == NULL ) + { + break; + } + + vout_InitPicture( VLC_OBJECT( p_vout ), p_pic, + p_vout->output.i_chroma, p_vout->output.i_width, + p_vout->output.i_height, p_vout->output.i_aspect ); + p_pic->p_data = p_vout->p_sys->p_data[0]; + p_pic->p[0].p_pixels = p_pic->p_data; + for( i_index = 1; i_index < p_pic->i_planes; i_index++ ) + { + p_pic->p[i_index].p_pixels = + p_pic->p[i_index-1].p_pixels + + p_pic->p[i_index-1].i_lines * + p_pic->p[i_index-1].i_pitch; + } + + p_pic->i_status = DESTROYED_PICTURE; + p_pic->i_type = DIRECT_PICTURE; + + PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; + I_OUTPUTPICTURES++; + } + + [p_vout->p_sys->o_glview lockFocus]; + [p_vout->p_sys->o_glview initTextures]; + [p_vout->p_sys->o_glview reshape]; + [p_vout->p_sys->o_glview unlockFocus]; + + return 0; +} + +static int InitQuickTime( vout_thread_t *p_vout ) +{ + picture_t *p_pic; + int i_index; + SetPort( p_vout->p_sys->p_qdport ); QTScaleMatrix( p_vout ); @@ -288,61 +435,47 @@ static int vout_Init( vout_thread_t *p_vout ) p_pic->i_type = DIRECT_PICTURE; PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; - I_OUTPUTPICTURES++; } - - return( 0 ); + return 0; } /***************************************************************************** - * vout_End: terminate video thread output method + * EndVideo: terminate video thread output method *****************************************************************************/ -static void vout_End( vout_thread_t *p_vout ) +static void EndVideo( vout_thread_t *p_vout ) { int i_index; - QTDestroySequence( p_vout ); + if( !p_vout->p_sys->i_opengl ) + { + 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 ) ) - { - msg_Err( p_vout, "unable to destroy window" ); + if( !p_vout->p_sys->i_opengl ) + { + QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] ); + } + else + { + free( p_vout->p_sys->p_data_orig[0] ); + free( p_vout->p_sys->p_data_orig[1] ); + } } - - 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 ); } /***************************************************************************** - * vout_Manage: handle events + * ManageVideo: 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 ) -{ +static int ManageVideo( vout_thread_t *p_vout ) +{ if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) { if( CoToggleFullscreen( p_vout ) ) @@ -355,39 +488,34 @@ static int vout_Manage( vout_thread_t *p_vout ) if( p_vout->i_changes & VOUT_SIZE_CHANGE ) { - QTScaleMatrix( p_vout ); - SetDSequenceMatrix( p_vout->p_sys->i_seq, - p_vout->p_sys->p_matrix ); + if( !p_vout->p_sys->i_opengl ) + { + 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 */ - if( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) + /* 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 ) { - vlc_bool_t b_change = 0; - - if( !p_vout->p_sys->b_mouse_pointer_visible ) + if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 3000000 ) { - CGDisplayShowCursor( kCGDirectMainDisplay ); - p_vout->p_sys->b_mouse_pointer_visible = 1; - b_change = 1; - } - else if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 && - p_vout->p_sys->b_mouse_pointer_visible ) - { - CGDisplayHideCursor( kCGDirectMainDisplay ); - p_vout->p_sys->b_mouse_pointer_visible = 0; - b_change = 1; - } - - if( b_change ) - { - p_vout->p_sys->b_mouse_moved = 0; - p_vout->p_sys->i_time_mouse_last_moved = 0; + VLCHideMouse( p_vout, YES ); } } - + else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) + { + VLCHideMouse( p_vout, NO ); + } + + /* disable screen saver */ + UpdateSystemActivity( UsrActivity ); + return( 0 ); } @@ -396,107 +524,197 @@ static int vout_Manage( vout_thread_t *p_vout ) ***************************************************************************** * This function sends the currently rendered image to the display. *****************************************************************************/ -static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) +static void DisplayVideo( 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 ) ) + if( !p_vout->p_sys->i_opengl ) { - msg_Err( p_vout, "DecompressSequenceFrameS failed: %d", err ); + 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 ); + } } else { - QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil ); + if( [p_vout->p_sys->o_glview lockFocusIfCanDraw] ) + { + int i_index; + int i_old = p_vout->p_sys->i_cur_pic; + int i_new = ( i_old + 1 ) % 2; + + /* Draw the new picture */ + p_vout->p_sys->i_cur_pic = i_new; + [p_vout->p_sys->o_glview drawRect: + [p_vout->p_sys->o_glview bounds]]; + + /* Reload the other texture. Textures have to be reloaded + before the buffer is filled (thanks to gcc from + arstechnica forums) */ + [p_vout->p_sys->o_glview reloadTexture: i_old]; + + /* Switch buffers */ + p_pic->p_data = p_vout->p_sys->p_data[i_old]; + p_pic->p[0].p_pixels = p_pic->p_data; + for( i_index = 1; i_index < p_pic->i_planes; i_index++ ) + { + p_pic->p[i_index].p_pixels = + p_pic->p[i_index-1].p_pixels + + p_pic->p[i_index-1].i_lines * + p_pic->p[i_index-1].i_pitch; + } + [p_vout->p_sys->o_glview unlockFocus]; + } } } /***************************************************************************** - * CoSendRequest: send request to interface thread + * ControlVideo: control facility for the vout + *****************************************************************************/ +static int ControlVideo( vout_thread_t *p_vout, int i_query, va_list args ) +{ + switch( i_query ) + { + case VOUT_SET_ZOOM: + return VLC_SUCCESS; + + case VOUT_SET_STAY_ON_TOP: + return VLC_SUCCESS; + + case VOUT_CLOSE: + case VOUT_REPARENT: + default: + return vout_vaControlDefault( p_vout, i_query, args ); + } +} + +/***************************************************************************** + * CoCreateWindow: create new window ***************************************************************************** * Returns 0 on success, 1 otherwise *****************************************************************************/ -static int CoSendRequest( vout_thread_t *p_vout, SEL sel ) +static int CoCreateWindow( vout_thread_t *p_vout ) { - int i_ret = 0; + vlc_value_t val; + NSScreen * o_screen; + vlc_bool_t b_main_screen; + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - VLCVout * o_vlv = [[[VLCVout alloc] init] autorelease]; + /* Allocate the window. It will be autoreleased when it receives 'close' */ + p_vout->p_sys->o_window = [VLCWindow alloc]; + [p_vout->p_sys->o_window setReleasedWhenClosed: YES]; - if( [o_vlv respondsToSelector: @selector(performSelectorOnMainThread: - withObject:waitUntilDone:)] ) + /* Find out on which screen to open the window */ + var_Get( p_vout, "video-device", &val ); + if( val.i_int < 0 ) { - [o_vlv performSelectorOnMainThread: sel - withObject: [NSValue valueWithPointer: p_vout] - waitUntilDone: YES]; + /* No preference specified. Use the main screen */ + o_screen = [NSScreen mainScreen]; + b_main_screen = 1; } - else if( [NSApp respondsToSelector: @selector(getIntf)] ) + else { - NSArray * o_array; - NSValue * o_value; - NSPort * o_recv_port; - NSInvocation * o_inv; - NSPortMessage * o_msg; - intf_thread_t * p_intf; - NSMethodSignature * o_sig; - - p_intf = (intf_thread_t *)[NSApp getIntf]; - - o_recv_port = [[NSPort port] retain]; - o_value = [NSValue valueWithPointer: p_vout]; + NSArray *o_screens = [NSScreen screens]; + unsigned int i_index = val.i_int; + + if( [o_screens count] < i_index ) + { + o_screen = [NSScreen mainScreen]; + b_main_screen = 1; + } + else + { + i_index--; + o_screen = [o_screens objectAtIndex: i_index]; + val.i_int = i_index; + var_Set( p_vout, "macosx-vdev", val ); + b_main_screen = (i_index == 0); + } + } - o_sig = [VLCVout instanceMethodSignatureForSelector: sel]; - o_inv = [NSInvocation invocationWithMethodSignature: o_sig]; - [o_inv setArgument: &o_value atIndex: 2]; - [o_inv setTarget: o_vlv]; - [o_inv setSelector: sel]; + if( p_vout->b_fullscreen ) + { + NSRect screen_rect = [o_screen frame]; + screen_rect.origin.x = screen_rect.origin.y = 0; - o_array = [NSArray arrayWithObject: - [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]]; - o_msg = [[NSPortMessage alloc] - initWithSendPort: p_intf->p_sys->o_sendport - receivePort: o_recv_port components: o_array]; + 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_lock = - [[NSConditionLock alloc] initWithCondition: 0]; - [o_msg sendBeforeDate: [NSDate distantPast]]; - [p_vout->p_sys->o_lock lockWhenCondition: 1]; - [p_vout->p_sys->o_lock unlock]; - [p_vout->p_sys->o_lock release]; - p_vout->p_sys->o_lock = nil; + /* Creates a window with size: screen_rect on o_screen */ + [p_vout->p_sys->o_window + initWithContentRect: screen_rect + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreBuffered + defer: NO screen: o_screen]; - [o_msg release]; - [o_recv_port release]; + [p_vout->p_sys->o_window setVout: p_vout]; + p_vout->p_sys->b_mouse_moved = YES; + p_vout->p_sys->i_time_mouse_last_moved = mdate(); } else { - msg_Err( p_vout, "SendRequest: no way to communicate with mt" ); - i_ret = 1; - } + 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; - [o_pool release]; + [p_vout->p_sys->o_window + initWithContentRect: p_vout->p_sys->s_rect + styleMask: i_stylemask + backing: NSBackingStoreBuffered + defer: NO screen: o_screen]; - return( i_ret ); -} + [p_vout->p_sys->o_window setVout: p_vout]; + var_Get( p_vout, "macosx-opaqueness", &val); + [p_vout->p_sys->o_window setAlphaValue: val.f_float]; + + var_Get( p_vout, "video-on-top", &val ); + if( val.b_bool ) [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; -/***************************************************************************** - * 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 ); + if( !p_vout->p_sys->b_pos_saved ) [p_vout->p_sys->o_window center]; } - return( 0 ); + if( !p_vout->p_sys->i_opengl ) + { +#define o_qtview p_vout->p_sys->o_qtview + o_qtview = [[VLCQTView alloc] init]; + [p_vout->p_sys->o_window setContentView: o_qtview]; + [o_qtview autorelease]; + + /* Retrieve the QuickDraw port */ + [o_qtview lockFocus]; + p_vout->p_sys->p_qdport = [o_qtview qdPort]; + [o_qtview unlockFocus]; +#undef o_qtview + } + else + { +#define o_glview p_vout->p_sys->o_glview + o_glview = [[VLCGLView alloc] initWithFrame: p_vout->p_sys->s_rect vout: p_vout]; + [p_vout->p_sys->o_window setContentView: o_glview]; + [o_glview autorelease]; +#undef o_glview + } + + [p_vout->p_sys->o_window updateTitle]; + [p_vout->p_sys->o_window makeKeyAndOrderFront: nil]; + + [o_pool release]; + return( 0); } /***************************************************************************** @@ -506,19 +724,28 @@ static int CoCreateWindow( vout_thread_t *p_vout ) *****************************************************************************/ static int CoDestroyWindow( vout_thread_t *p_vout ) { - if( !p_vout->p_sys->b_mouse_pointer_visible ) - { - CGDisplayShowCursor( kCGDirectMainDisplay ); - p_vout->p_sys->b_mouse_pointer_visible = 1; - } + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; + VLCHideMouse( p_vout, NO ); - if( CoSendRequest( p_vout, @selector(destroyWindow:) ) ) + if( !p_vout->b_fullscreen ) { - msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" ); - return( 1 ); - } + NSRect s_rect; - return( 0 ); + /* remember the window position before we enter fullscreen */ + 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; + [o_pool release]; + return 0; } /***************************************************************************** @@ -528,7 +755,12 @@ static int CoDestroyWindow( vout_thread_t *p_vout ) *****************************************************************************/ static int CoToggleFullscreen( vout_thread_t *p_vout ) { - QTDestroySequence( p_vout ); + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; + + if( !p_vout->p_sys->i_opengl ) + { + QTDestroySequence( p_vout ); + } if( CoDestroyWindow( p_vout ) ) { @@ -538,32 +770,74 @@ static int CoToggleFullscreen( vout_thread_t *p_vout ) p_vout->b_fullscreen = !p_vout->b_fullscreen; - config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen ); - if( CoCreateWindow( p_vout ) ) { msg_Err( p_vout, "unable to create window" ); return( 1 ); } - SetPort( p_vout->p_sys->p_qdport ); - QTScaleMatrix( p_vout ); - - if( QTCreateSequence( p_vout ) ) + if( p_vout->p_sys->i_opengl ) { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); - } + [p_vout->p_sys->o_glview lockFocus]; + [p_vout->p_sys->o_glview initTextures]; + [p_vout->p_sys->o_glview reshape]; + [p_vout->p_sys->o_glview drawRect: + [p_vout->p_sys->o_glview bounds]]; + [p_vout->p_sys->o_glview unlockFocus]; + } + else + { + SetPort( p_vout->p_sys->p_qdport ); + QTScaleMatrix( p_vout ); + + if( QTCreateSequence( p_vout ) ) + { + msg_Err( p_vout, "unable to create sequence" ); + return( 1 ); + } + } + [o_pool release]; return( 0 ); } +/***************************************************************************** + * VLCHideMouse: if b_hide then hide the cursor + *****************************************************************************/ +static void VLCHideMouse ( vout_thread_t *p_vout, 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]; + + s_rect = [o_contents bounds]; + ml = [o_window convertScreenToBase:[NSEvent mouseLocation]]; + ml = [o_contents convertPoint:ml fromView:nil]; + b_inside = [o_contents mouse: ml inRect: s_rect]; + + if ( b_hide && b_inside ) + { + /* only hide if mouse over VLCQTView */ + [NSCursor setHiddenUntilMouseMoves: YES]; + } + 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 ) { Rect s_rect; + vlc_value_t val; unsigned int i_width, i_height; Fixed factor_x, factor_y; unsigned int i_offset_x = 0; @@ -574,7 +848,16 @@ static void QTScaleMatrix( vout_thread_t *p_vout ) 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 ) + var_Get( p_vout, "macosx-stretch", &val ); + if( val.b_bool ) + { + factor_x = FixDiv( Long2Fix( i_width ), + Long2Fix( p_vout->output.i_width ) ); + factor_y = FixDiv( Long2Fix( i_height ), + Long2Fix( p_vout->output.i_height ) ); + + } + else if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR ) { int i_adj_width = i_height * p_vout->output.i_aspect / VOUT_ASPECT_FACTOR; @@ -598,21 +881,15 @@ static void QTScaleMatrix( vout_thread_t *p_vout ) i_offset_y = (i_height - i_adj_height) / 2; } - /* the following is for the resize bar. Dirty hack (hartman) */ - if ( !p_vout->b_fullscreen) - { - i_offset_y = i_offset_y - 12; - } - + 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) ); + Long2Fix(0), Long2Fix(0) ); + + TranslateMatrix( p_vout->p_sys->p_matrix, + Long2Fix(i_offset_x), Long2Fix(i_offset_y) ); } /***************************************************************************** @@ -783,9 +1060,64 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) return( p_vout ); } +- (void)scaleWindowWithFactor: (float)factor +{ + NSSize newsize; + int i_corrected_height, i_corrected_width; + NSPoint topleftbase; + NSPoint topleftscreen; + + if ( !p_vout->b_fullscreen ) + { + topleftbase.x = 0; + 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 ) + { + i_corrected_width = p_vout->output.i_height * p_vout->output.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; + newsize.width = (int) ( p_vout->render.i_width * factor ); + newsize.height = (int) ( i_corrected_height * factor ); + } + + [self setContentSize: newsize]; + + [self setFrameTopLeftPoint: topleftscreen]; + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } +} + +- (void)toggleFloatOnTop +{ + vlc_value_t val; + if( var_Get( p_vout, "video-on-top", &val )>=0 && val.b_bool) + { + val.b_bool = VLC_FALSE; + var_Set( p_vout, "video-on-top", val ); + [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel]; + } + else + { + val.b_bool = VLC_TRUE; + var_Set( p_vout, "video-on-top", val ); + [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; + } +} + - (void)toggleFullscreen { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + vlc_value_t val; + val.b_bool = !p_vout->b_fullscreen; + var_Set( p_vout, "fullscreen", val ); } - (BOOL)isFullscreen @@ -797,48 +1129,103 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) { return( YES ); } - +/* +- (BOOL)performKeyEquivalent:(NSEvent *)o_event +{ + return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event]; +} +*/ - (void)keyDown:(NSEvent *)o_event { unichar key = 0; + vlc_value_t val; + unsigned int i_pressed_modifiers = 0; + val.i_int = 0; + + i_pressed_modifiers = [o_event modifierFlags]; - if( [[o_event characters] length] ) + if( i_pressed_modifiers & NSShiftKeyMask ) + val.i_int |= KEY_MODIFIER_SHIFT; + if( i_pressed_modifiers & NSControlKeyMask ) + val.i_int |= KEY_MODIFIER_CTRL; + if( i_pressed_modifiers & NSAlternateKeyMask ) + val.i_int |= KEY_MODIFIER_ALT; + if( i_pressed_modifiers & NSCommandKeyMask ) + val.i_int |= KEY_MODIFIER_COMMAND; + + key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; + + if( key ) + { + /* Escape should always get you out of fullscreen */ + if( key == (unichar) 0x1b ) + { + if( [self isFullscreen] ) + { + [self toggleFullscreen]; + } + } + 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); + } + } + else + { + val.i_int |= CocoaKeyToVLC( key ); + var_Set( p_vout->p_vlc, "key-pressed", val ); + } + } + else { - key = [[o_event characters] characterAtIndex: 0]; + [super keyDown: o_event]; } +} - switch( key ) +- (void)updateTitle +{ + NSMutableString * o_title; + playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + + if( p_playlist == NULL ) { - case 'f': case 'F': - [self toggleFullscreen]; - break; + return; + } - case (unichar)0x1b: /* escape */ - if( [self isFullscreen] ) - { - [self toggleFullscreen]; - } - break; + vlc_mutex_lock( &p_playlist->object_lock ); + o_title = [NSMutableString stringWithUTF8String: + p_playlist->pp_items[p_playlist->i_index]->input.psz_uri]; + vlc_mutex_unlock( &p_playlist->object_lock ); - case 'q': case 'Q': - p_vout->p_vlc->b_die = VLC_TRUE; - break; + vlc_object_release( p_playlist ); - case ' ': - input_SetStatus( p_vout, INPUT_STATUS_PAUSE ); - break; + if( o_title != nil ) + { + NSRange prefix_range = [o_title rangeOfString: @"file:"]; + if( prefix_range.location != NSNotFound ) + { + [o_title deleteCharactersInRange: prefix_range]; + } - default: - [super keyDown: o_event]; - break; + [self setTitleWithRepresentedFilename: o_title]; + } + else + { + [self setTitle: + [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]]; } } /* This is actually the same as VLCControls::stop. */ - (BOOL)windowShouldClose:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if( p_playlist == NULL ) { @@ -847,7 +1234,6 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); - p_intf->p_sys->b_stopping = 1; /* The window will be closed by the intf later. */ return NO; @@ -855,10 +1241,193 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) @end +/* Common QT and OpenGL code to catch mouse events */ +#define CATCH_MOUSE_EVENTS \ +- (BOOL)acceptsFirstResponder \ +{ \ + return( YES ); \ +} \ + \ +- (BOOL)becomeFirstResponder \ +{ \ + id o_window = [self window]; \ + \ + [o_window setAcceptsMouseMovedEvents: YES]; \ + return( YES ); \ +} \ + \ +- (BOOL)resignFirstResponder \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + \ + [o_window setAcceptsMouseMovedEvents: NO]; \ + VLCHideMouse( vout, NO ); \ + return( YES ); \ +} \ + \ +- (void)mouseDown:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSLeftMouseDown: \ + { \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int |= 1; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseDown: o_event]; \ + break; \ + } \ +} \ + \ +- (void)otherMouseDown:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSOtherMouseDown: \ + { \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int |= 2; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseDown: o_event]; \ + break; \ + } \ +} \ + \ +- (void)rightMouseDown:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSRightMouseDown: \ + { \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int |= 4; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseDown: o_event]; \ + break; \ + } \ +} \ + \ +- (void)mouseUp:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSLeftMouseUp: \ + { \ + vlc_value_t b_val; \ + b_val.b_bool = VLC_TRUE; \ + var_Set( vout, "mouse-clicked", b_val ); \ + \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int &= ~1; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseUp: o_event]; \ + break; \ + } \ +} \ + \ +- (void)otherMouseUp:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSOtherMouseUp: \ + { \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int &= ~2; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseUp: o_event]; \ + break; \ + } \ +} \ + \ +- (void)rightMouseUp:(NSEvent *)o_event \ +{ \ + vout_thread_t * vout; \ + id o_window = [self window]; \ + vout = (vout_thread_t *)[o_window getVout]; \ + vlc_value_t val; \ + \ + switch( [o_event type] ) \ + { \ + case NSRightMouseUp: \ + { \ + var_Get( vout, "mouse-button-down", &val ); \ + val.i_int &= ~4; \ + var_Set( vout, "mouse-button-down", val ); \ + } \ + break; \ + \ + default: \ + [super mouseUp: o_event]; \ + break; \ + } \ +} \ + \ +- (void)mouseDragged:(NSEvent *)o_event \ +{ \ + [self mouseMoved:o_event]; \ +} \ + \ +- (void)otherMouseDragged:(NSEvent *)o_event \ +{ \ + [self mouseMoved:o_event]; \ +} \ + \ +- (void)rightMouseDragged:(NSEvent *)o_event \ +{ \ + [self mouseMoved:o_event]; \ +} + /***************************************************************************** - * VLCView implementation + * VLCQTView implementation *****************************************************************************/ -@implementation VLCView +@implementation VLCQTView - (void)drawRect:(NSRect)rect { @@ -866,54 +1435,14 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) id o_window = [self window]; p_vout = (vout_thread_t *)[o_window getVout]; - if ( p_vout->b_fullscreen ) - { - [[NSColor blackColor] set]; - NSRectFill( rect ); - } + [[NSColor blackColor] set]; + NSRectFill( rect ); [super drawRect: rect]; p_vout->i_changes |= VOUT_SIZE_CHANGE; } -- (BOOL)acceptsFirstResponder -{ - return( YES ); -} - -- (BOOL)becomeFirstResponder -{ - [[self window] setAcceptsMouseMovedEvents: YES]; - return( YES ); -} - -- (BOOL)resignFirstResponder -{ - [[self window] setAcceptsMouseMovedEvents: NO]; - return( YES ); -} - -- (void)mouseUp:(NSEvent *)o_event -{ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - switch( [o_event type] ) - { - case NSLeftMouseUp: - { - vlc_value_t val; - val.b_bool = VLC_TRUE; - var_Set( p_vout, "mouse-clicked", val ); - } - break; - - default: - [super mouseUp: o_event]; - break; - } -} +CATCH_MOUSE_EVENTS - (void)mouseMoved:(NSEvent *)o_event { @@ -948,176 +1477,385 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) 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 = 1; - } - else - { - [super mouseMoved: o_event]; + p_vout->p_sys->b_mouse_moved = YES; } + + [super mouseMoved: o_event]; } @end /***************************************************************************** - * VLCVout implementation + * VLCGLView implementation *****************************************************************************/ -@implementation VLCVout +@implementation VLCGLView + -- (void)createWindow:(NSValue *)o_value +- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) _p_vout { vlc_value_t val; - VLCView * o_view; - NSScreen * o_screen; - vout_thread_t * p_vout; - id o_title; - vlc_bool_t b_main_screen; - - intf_thread_t * p_intf = [NSApp getIntf]; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_vout = _p_vout; - p_vout = (vout_thread_t *)[o_value pointerValue]; + NSOpenGLPixelFormatAttribute attribs[] = + { + NSOpenGLPFAAccelerated, + NSOpenGLPFANoRecovery, + NSOpenGLPFAColorSize, 24, + NSOpenGLPFAAlphaSize, 8, + NSOpenGLPFADepthSize, 24, + NSOpenGLPFAWindow, + 0 + }; + + NSOpenGLPixelFormat * fmt = [[NSOpenGLPixelFormat alloc] + initWithAttributes: attribs]; + + if( !fmt ) + { + msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" ); + return nil; + } - 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]; + self = [super initWithFrame:frame pixelFormat: fmt]; + [fmt release]; - if( var_Get( p_vout, "video-device", &val ) < 0 ) + [[self openGLContext] makeCurrentContext]; + [[self openGLContext] update]; + + /* Black background */ + glClearColor( 0.0, 0.0, 0.0, 0.0 ); + + /* Check if the user asked for useless visual effects */ + var_Get( p_vout, "macosx-opengl-effect", &val ); + if( !val.psz_string || !strcmp( val.psz_string, "none" )) { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; + i_effect = OPENGL_EFFECT_NONE; + } + else if( !strcmp( val.psz_string, "cube" ) ) + { + i_effect = OPENGL_EFFECT_CUBE; + + glEnable( GL_DEPTH_TEST ); + } + else if( !strcmp( val.psz_string, "transparent-cube" ) ) + { + i_effect = OPENGL_EFFECT_TRANSPARENT_CUBE; + + glDisable( GL_DEPTH_TEST ); + glEnable( GL_BLEND ); + glBlendFunc( GL_SRC_ALPHA, GL_ONE ); } else { - unsigned int i_index = 0; - NSArray *o_screens = [NSScreen screens]; + msg_Warn( p_vout, "no valid opengl effect provided, using " + "\"none\"" ); + i_effect = OPENGL_EFFECT_NONE; + } + if( val.psz_string ) free( val.psz_string ); + + if( i_effect & ( OPENGL_EFFECT_CUBE | + OPENGL_EFFECT_TRANSPARENT_CUBE ) ) + { + /* Set the perpective */ + glMatrixMode( GL_PROJECTION ); + glLoadIdentity(); + glFrustum( -1.0, 1.0, -1.0, 1.0, 3.0, 20.0 ); + glMatrixMode( GL_MODELVIEW ); + glLoadIdentity(); + glTranslatef( 0.0, 0.0, - 5.0 ); + } + + pi_textures[0] = 0; + pi_textures[1] = 0; + initDone = 0; + + return self; +} + +- (void)reshape +{ + vlc_value_t val; + NSRect bounds; + + if( !initDone ) + { + return; + } + + [[self openGLContext] makeCurrentContext]; - if( !sscanf( val.psz_string, _("Screen %d"), &i_index ) || - [o_screens count] < i_index ) + bounds = [self bounds]; + glViewport( 0, 0, (GLint) bounds.size.width, + (GLint) bounds.size.height ); + + var_Get( p_vout, "macosx-stretch", &val ); + if( val.b_bool ) + { + f_x = 1.0; + f_y = 1.0; + } + else + { + /* Quad size is set in order to preserve the aspect ratio */ + var_Get( p_vout, "macosx-fill", &val ); + int fill = ( val.b_bool && p_vout->b_fullscreen ); + int large = ( bounds.size.height * p_vout->output.i_aspect < + bounds.size.width * VOUT_ASPECT_FACTOR ); + if( ( large && !fill ) || ( !large && fill ) ) { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; + f_x = bounds.size.height * p_vout->output.i_aspect / + VOUT_ASPECT_FACTOR / bounds.size.width; + f_y = 1.0; } else { - i_index--; - o_screen = [o_screens objectAtIndex: i_index]; - config_PutInt( p_vout, "macosx-vdev", i_index ); - b_main_screen = (i_index == 0); - } + f_x = 1.0; + f_y = bounds.size.width * VOUT_ASPECT_FACTOR / + p_vout->output.i_aspect / bounds.size.height; + } + } +} - free( val.psz_string ); - } +- (void)initTextures +{ + int i; + [[self openGLContext] makeCurrentContext]; - if( p_vout->b_fullscreen ) + /* Free previous texture if any */ + if( initDone ) { - NSRect screen_rect = [o_screen frame]; - screen_rect.origin.x = screen_rect.origin.y = 0; + glDeleteTextures( 2, pi_textures ); + } - 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 ); + glEnable( GL_TEXTURE_RECTANGLE_EXT ); + glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE ); - [p_vout->p_sys->o_window - initWithContentRect: screen_rect - styleMask: NSBorderlessWindowMask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; + glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, p_vout->output.i_width ); - [p_vout->p_sys->o_window setLevel: NSModalPanelWindowLevel]; - p_vout->p_sys->b_mouse_moved = 1; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - } - else + /* Tell the driver not to make a copy of the texture but to use + our buffer */ + glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE ); + + /* Create textures */ + glGenTextures( 2, pi_textures ); + + for( i = 0; i < 2; i++ ) { - unsigned int i_stylemask = NSTitledWindowMask | - NSMiniaturizableWindowMask | - NSClosableWindowMask | - NSResizableWindowMask; /* | - NSTexturedBackgroundWindowMask;*/ - - /* the following is for the resize bar. Dirty hack (hartman) */ - p_vout->p_sys->s_rect.size.height = p_vout->p_sys->s_rect.size.height + 24; + glBindTexture( GL_TEXTURE_RECTANGLE_EXT, pi_textures[i] ); + glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); + + /* Linear interpolation */ + glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, + GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, + GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + + /* Use VRAM texturing */ + glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, + GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE ); + + glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGB8, + p_vout->output.i_width, p_vout->output.i_height, 0, + GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, + p_vout->p_sys->p_data[i] ); + } - 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; + /* Swap buffers only during the vertical retrace of the monitor. + http://developer.apple.com/documentation/GraphicsImaging/ + Conceptual/OpenGL/chap5/chapter_5_section_44.html */ + long params[] = { 1 }; + CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, + params ); - [p_vout->p_sys->o_window - initWithContentRect: p_vout->p_sys->s_rect - styleMask: i_stylemask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; + initDone = 1; +} - if( !p_vout->p_sys->b_pos_saved ) - { - [p_vout->p_sys->o_window center]; - } +- (void)reloadTexture: (int) index +{ + if( !initDone ) + { + return; } + + [[self openGLContext] makeCurrentContext]; + + glBindTexture( GL_TEXTURE_RECTANGLE_EXT, pi_textures[index] ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, p_vout->output.i_width ); + + /* glTexSubImage2D is faster than glTexImage2D + http://developer.apple.com/samplecode/Sample_Code/Graphics_3D/ + TextureRange/MainOpenGLView.m.htm */ + glTexSubImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0, + p_vout->output.i_width, p_vout->output.i_height, + GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, + p_vout->p_sys->p_data[index] ); +} + +- (void) cleanUp +{ + initDone = 0; +} + +- (void) drawQuad +{ + glBegin( GL_QUADS ); + /* Top left */ + glTexCoord2f( 0.0, 0.0 ); + glVertex2f( - f_x, f_y ); + /* Bottom left */ + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex2f( - f_x, - f_y ); + /* Bottom right */ + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex2f( f_x, - f_y ); + /* Top right */ + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex2f( f_x, f_y ); + glEnd(); +} - o_view = [[VLCView alloc] init]; - /* FIXME: [o_view setMenu:] */ - [p_vout->p_sys->o_window setContentView: o_view]; - [o_view autorelease]; +- (void) drawCube +{ + glBegin( GL_QUADS ); + /* Front */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( - 1.0, 1.0, 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( - 1.0, - 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( 1.0, - 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( 1.0, 1.0, 1.0 ); + + /* Left */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( - 1.0, 1.0, - 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( - 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( - 1.0, - 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( - 1.0, 1.0, 1.0 ); + + /* Back */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( 1.0, 1.0, - 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( - 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( - 1.0, 1.0, - 1.0 ); + + /* Right */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( 1.0, 1.0, 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( 1.0, - 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( 1.0, 1.0, - 1.0 ); + + /* Top */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( - 1.0, 1.0, - 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( - 1.0, 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( 1.0, 1.0, 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( 1.0, 1.0, - 1.0 ); + + /* Bottom */ + glTexCoord2f( 0.0, 0.0 ); + glVertex3f( - 1.0, - 1.0, 1.0 ); + glTexCoord2f( 0.0, (float) p_vout->output.i_height ); + glVertex3f( - 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, + (float) p_vout->output.i_height ); + glVertex3f( 1.0, - 1.0, - 1.0 ); + glTexCoord2f( (float) p_vout->output.i_width, 0.0 ); + glVertex3f( 1.0, - 1.0, 1.0 ); + glEnd(); +} - [o_view lockFocus]; - p_vout->p_sys->p_qdport = [o_view qdPort]; - [o_view unlockFocus]; +- (void) drawRect: (NSRect) rect +{ + [[self openGLContext] makeCurrentContext]; + /* Black background */ + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - if( p_playlist == NULL ) + if( !initDone ) { + glFlush(); return; } - vlc_mutex_lock( &p_playlist->object_lock ); - o_title = [NSString stringWithUTF8String: - p_playlist->pp_items[p_playlist->i_index]->psz_name]; - vlc_mutex_unlock( &p_playlist->object_lock ); - - vlc_object_release( p_playlist ); - - if (o_title) + /* Draw */ + glBindTexture( GL_TEXTURE_RECTANGLE_EXT, + pi_textures[p_vout->p_sys->i_cur_pic] ); + if( i_effect & ( OPENGL_EFFECT_CUBE | + OPENGL_EFFECT_TRANSPARENT_CUBE ) ) { - [p_vout->p_sys->o_window setTitle: o_title]; - [p_vout->p_sys->o_window makeKeyAndOrderFront: nil]; + glRotatef( 1.0, 0.3, 0.5, 0.7 ); + [self drawCube]; } else { - [p_vout->p_sys->o_window setTitle: - [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]]; - [p_vout->p_sys->o_window makeKeyAndOrderFront: nil]; + [self drawQuad]; } + + /* Draw */ + glFlush(); } -- (void)destroyWindow:(NSValue *)o_value +CATCH_MOUSE_EVENTS + +- (void)mouseMoved:(NSEvent *)o_event { - vout_thread_t * p_vout; + NSPoint ml; + NSRect s_rect; + BOOL b_inside; - p_vout = (vout_thread_t *)[o_value pointerValue]; + s_rect = [self bounds]; + ml = [self convertPoint: [o_event locationInWindow] fromView: nil]; + b_inside = [self mouse: ml inRect: s_rect]; - if( !p_vout->b_fullscreen ) + if( b_inside ) { - NSRect s_rect; - - s_rect = [[p_vout->p_sys->o_window contentView] frame]; - p_vout->p_sys->s_rect.size = s_rect.size; + 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 ); - s_rect = [p_vout->p_sys->o_window frame]; - p_vout->p_sys->s_rect.origin = s_rect.origin; + val.i_int = ( (int)ml.x - i_x ) * + p_vout->render.i_width / i_width; + var_Set( p_vout, "mouse-x", val ); - p_vout->p_sys->b_pos_saved = 1; - } - else /* the following is for the resize bar. Dirty hack (hartman) */ - { - p_vout->p_sys->s_rect.size.height = p_vout->p_sys->s_rect.size.height - 24; + /* Y coordinate is inverted in OpenGL */ + val.i_int = ( ((int)(s_rect.size.height - 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; } - 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