/*****************************************************************************
- * vout.m: MacOS X video output plugin
+ * vout.m: MacOS X video output module
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.m,v 1.18 2003/01/24 06:21:03 hartman Exp $
+ * $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Eric Petit <titer@m0k.org>
*
* 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
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc/intf.h>
-
-#include <Cocoa/Cocoa.h>
#include <QuickTime/QuickTime.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+
+#include <vlc_keys.h>
+
#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
{
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
static int vout_Init ( vout_thread_t * );
static void vout_End ( vout_thread_t * );
static int vout_Manage ( 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 * );
vout_thread_t * p_vout = (vout_thread_t *)p_this;
OSErr err;
int i_timeout;
+ char *psz_vout_type;
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
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 );
}
}
- 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_pointer_visible = 1;
+ 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 );
- }
+ /* Check if we should use QuickTime or OpenGL */
+ psz_vout_type = config_GetPsz( p_vout, "macosx-vout" );
- if( vout_ChromaCmp( p_vout->render.i_chroma, VLC_FOURCC('I','4','2','0') ) )
+ if( !strncmp( psz_vout_type, "auto", 4 ) )
+ {
+ p_vout->p_sys->i_opengl = CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay );
+ }
+ else if( !strncmp( psz_vout_type, "opengl", 6 ) )
+ {
+ p_vout->p_sys->i_opengl = VLC_TRUE;
+ }
+ else
+ {
+ p_vout->p_sys->i_opengl = VLC_FALSE;
+ }
+ free( psz_vout_type );
+
+ 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( 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 );
+ 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');
{
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 );
- }
-
- 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 );
+ msg_Dbg( p_vout, "using OpenGL mode" );
}
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 )
{
int i = 1;
- vlc_value_t val;
+ vlc_value_t val, text;
NSScreen * o_screen;
int i_option = config_GetInt( p_vout, "macosx-vdev" );
- 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 )
"%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;
+ val.i_int = i;
+ var_Change( p_vout, "video-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
if( ( i - 1 ) == i_option )
{
var_Set( p_vout, "video-device", val );
}
-
i++;
}
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 );
+ 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 );
}
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( !p_vout->p_sys->i_opengl )
+ {
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
- if( QTCreateSequence( p_vout ) )
+ if( QTCreateSequence( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to create sequence" );
+ return( 1 );
+ }
+ }
+ else
{
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
+ 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;
}
/* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */
- while( I_OUTPUTPICTURES < QT_MAX_DIRECTBUFFERS )
+ while( I_OUTPUTPICTURES <
+ p_vout->p_sys->i_opengl ? 1 : QT_MAX_DIRECTBUFFERS )
{
p_pic = NULL;
}
/* Allocate the picture */
- if( p_pic == NULL || QTNewPicture( p_vout, p_pic ) )
+ if( p_pic == NULL )
{
break;
}
+ if( !p_vout->p_sys->i_opengl )
+ {
+ if( QTNewPicture( p_vout, p_pic ) )
+ {
+ break;
+ }
+ }
+ else
+ {
+ /* Nothing special to do, we just need a basic allocated
+ picture_t */
+ vout_AllocatePicture( 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->i_status = DESTROYED_PICTURE;
p_pic->i_type = DIRECT_PICTURE;
I_OUTPUTPICTURES++;
}
+ if( p_vout->p_sys->i_opengl )
+ {
+ [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 );
}
{
int i_index;
- QTDestroySequence( p_vout );
+ if( !p_vout->p_sys->i_opengl )
+ {
+ QTDestroySequence( p_vout );
+ }
+ else
+ {
+ [p_vout->p_sys->o_glview cleanUp];
+ }
/* Free the direct buffers we allocated */
for( i_index = I_OUTPUTPICTURES; i_index; )
{
i_index--;
- QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] );
+ if( !p_vout->p_sys->i_opengl )
+ {
+ QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] );
+ }
+ else
+ {
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ }
}
}
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 )
+ {
+ if ( p_vout->p_sys->p_fullscreen_state != NULL )
+ EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
- ExitMovies();
+ ExitMovies();
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ free( p_vout->p_sys->p_matrix );
+ DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ }
free( p_vout->p_sys );
}
* 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 ) )
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 );
}
*****************************************************************************/
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 ) )
+ 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] )
+ {
+ /* Texture gotta be reload before the buffer is filled
+ (thanks to gcc from arstechnica forums) */
+ [p_vout->p_sys->o_glview drawRect:
+ [p_vout->p_sys->o_glview bounds]];
+ [p_vout->p_sys->o_glview reloadTexture];
+ [p_vout->p_sys->o_glview unlockFocus];
+ }
}
}
static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
{
int i_ret = 0;
+ vlc_value_t val;
+ intf_thread_t * p_intf;
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- VLCVout * o_vlv = [[[VLCVout alloc] init] autorelease];
+ VLCVout * o_vlv = [[VLCVout alloc] init];
- if( [o_vlv respondsToSelector: @selector(performSelectorOnMainThread:
- withObject:waitUntilDone:)] )
+ if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
{
- [o_vlv performSelectorOnMainThread: sel
- withObject: [NSValue valueWithPointer: p_vout]
- waitUntilDone: YES];
+ msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
}
- else if( [NSApp respondsToSelector: @selector(getIntf)] )
- {
- 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_vlv release];
- o_recv_port = [[NSPort port] retain];
- o_value = [NSValue valueWithPointer: p_vout];
+ /*This makes this function dependant of the presence of a macosx
+ interface. We do not check if this interface exists, since it has
+ already been done before.*/
- 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];
+ p_intf = [NSApp getIntf];
- 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];
-
- 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;
-
- [o_msg release];
- [o_recv_port release];
- }
- else
- {
- msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
- i_ret = 1;
- }
-
- [o_pool release];
+ val.b_bool = VLC_TRUE;
+ var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
+ var_Set(p_intf, "intf-change",val);
return( i_ret );
}
msg_Err( p_vout, "CoSendRequest (createWindow) failed" );
return( 1 );
}
-
+
return( 0 );
}
*****************************************************************************/
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;
- }
+
+ VLCHideMouse( p_vout, NO );
if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
{
*****************************************************************************/
static int CoToggleFullscreen( vout_thread_t *p_vout )
{
+
+ vlc_value_t val;
+ intf_thread_t * p_intf;
+
+ if( p_vout->p_sys->i_opengl )
+ {
+ p_vout->b_fullscreen = !p_vout->b_fullscreen;
+ if( p_vout->b_fullscreen )
+ {
+ [p_vout->p_sys->o_glview goFullScreen];
+ }
+ else
+ {
+ [p_vout->p_sys->o_glview exitFullScreen];
+ }
+ /*This makes this function dependant of the presence of a macosx
+ interface. We do not check if this interface exists, since it has
+ already been done before.*/
+
+ p_intf = [NSApp getIntf];
+
+ val.b_bool = VLC_TRUE;
+ var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
+ var_Set(p_intf, "intf-change",val);
+
+ return 0;
+ }
+
QTDestroySequence( p_vout );
if( CoDestroyWindow( 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( 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
*****************************************************************************/
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( config_GetInt( p_vout, "macosx-stretch" ) )
+ {
+ 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;
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) );
}
/*****************************************************************************
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
+{
+ if( config_GetInt( p_vout, "video-on-top" ) )
+ {
+ config_PutInt( p_vout, "video-on-top", 0 );
+ [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel];
+ }
+ else
+ {
+ config_PutInt( p_vout, "video-on-top", 1 );
+ [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ }
+}
+
- (void)toggleFullscreen
{
+ config_PutInt(p_vout, "fullscreen", !p_vout->b_fullscreen);
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
}
return( YES );
}
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+ return [(VLCApplication *) [VLCApplication sharedApplication]
+ 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( 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;
- if( [[o_event characters] length] )
+ key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+
+ if( key )
{
- key = [[o_event characters] characterAtIndex: 0];
+ /* 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
+ {
+ [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 )
{
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;
@end
/*****************************************************************************
- * VLCView implementation
+ * VLCQTView implementation
*****************************************************************************/
-@implementation VLCView
+@implementation VLCQTView
- (void)drawRect:(NSRect)rect
{
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)becomeFirstResponder
{
- [[self window] setAcceptsMouseMovedEvents: YES];
+ vout_thread_t * p_vout;
+ id o_window = [self window];
+ p_vout = (vout_thread_t *)[o_window getVout];
+
+ [o_window setAcceptsMouseMovedEvents: YES];
return( YES );
}
- (BOOL)resignFirstResponder
{
- [[self window] setAcceptsMouseMovedEvents: NO];
+ 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 );
}
+- (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 );
+ val.i_int |= 1;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
+ }
+}
+
+- (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] )
+ {
+ case NSOtherMouseDown:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 2;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
+ }
+}
+
+- (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] )
+ {
+ case NSRightMouseDown:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 4;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
+ }
+}
+
- (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] )
{
case NSLeftMouseUp:
{
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", val );
+ 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;
+ }
+}
+- (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] )
+ {
+ case NSOtherMouseUp:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
default:
[super mouseUp: o_event];
break;
}
}
+- (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] )
+ {
+ case NSRightMouseUp:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~4;
+ var_Set( p_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];
+}
+
- (void)mouseMoved:(NSEvent *)o_event
{
NSPoint ml;
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;
+ p_vout->p_sys->b_mouse_moved = YES;
+ }
+
+ [super mouseMoved: o_event];
+}
+
+@end
+
+/*****************************************************************************
+ * VLCGLView implementation
+ *****************************************************************************/
+@implementation VLCGLView
+
+
+- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) _p_vout
+{
+ char * psz_effect;
+ p_vout = _p_vout;
+
+ NSOpenGLPixelFormatAttribute attribs[] =
+ {
+ NSOpenGLPFAAccelerated,
+ NSOpenGLPFANoRecovery,
+ NSOpenGLPFADoubleBuffer,
+ 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;
+ }
+
+ self = [super initWithFrame:frame pixelFormat: fmt];
+
+ currentContext = [self openGLContext];
+ [currentContext makeCurrentContext];
+ [currentContext update];
+
+ /* Black background */
+ glClearColor( 0.0, 0.0, 0.0, 0.0 );
+
+ /* Check if the user asked for useless visual effects */
+ psz_effect = config_GetPsz( p_vout, "macosx-opengl-effect" );
+ if( !psz_effect || !strcmp( psz_effect, "none" ))
+ {
+ i_effect = OPENGL_EFFECT_NONE;
+ }
+ else if( !strcmp( psz_effect, "cube" ) )
+ {
+ i_effect = OPENGL_EFFECT_CUBE;
+
+ glEnable( GL_DEPTH_TEST );
+ }
+ else if( !strcmp( psz_effect, "transparent-cube" ) )
+ {
+ i_effect = OPENGL_EFFECT_TRANSPARENT_CUBE;
+
+ glDisable( GL_DEPTH_TEST );
+ glEnable( GL_BLEND );
+ glBlendFunc( GL_SRC_ALPHA, GL_ONE );
}
else
{
- [super mouseMoved: o_event];
+ msg_Warn( p_vout, "no valid opengl effect provided, using "
+ "\"none\"" );
+ i_effect = OPENGL_EFFECT_NONE;
}
+
+ 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 );
+ }
+
+ i_texture = 0;
+ initDone = 0;
+ isFullScreen = 0;
+
+ return self;
+}
+
+- (void) reshape
+{
+ if( !initDone )
+ {
+ return;
+ }
+
+ [currentContext makeCurrentContext];
+
+ NSRect bounds = [self bounds];
+ glViewport( 0, 0, (GLint) bounds.size.width,
+ (GLint) bounds.size.height );
+
+ /* Quad size is set in order to preserve the aspect ratio */
+ if( config_GetInt( p_vout, "macosx-stretch" ) )
+ {
+ f_x = 1.0;
+ f_y = 1.0;
+ }
+ else if( bounds.size.height * p_vout->output.i_aspect <
+ bounds.size.width * VOUT_ASPECT_FACTOR )
+ {
+ f_x = bounds.size.height * p_vout->output.i_aspect /
+ VOUT_ASPECT_FACTOR / bounds.size.width;
+ f_y = 1.0;
+ }
+ else
+ {
+ f_x = 1.0;
+ f_y = bounds.size.width * VOUT_ASPECT_FACTOR /
+ p_vout->output.i_aspect / bounds.size.height;
+ }
+}
+
+- (void) initTextures
+{
+ [currentContext makeCurrentContext];
+
+ /* Free previous texture if any */
+ if( i_texture )
+ {
+ glDeleteTextures( 1, &i_texture );
+ }
+
+ /* Create textures */
+ glGenTextures( 1, &i_texture );
+
+ glEnable( GL_TEXTURE_RECTANGLE_EXT );
+ glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE );
+
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+
+ /* Use VRAM texturing */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE );
+
+ /* Tell the driver not to make a copy of the texture but to use
+ our buffer */
+ glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE );
+
+ /* Linear interpolation */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+ /* I have no idea what this exactly does, but it seems to be
+ necessary for scaling */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
+
+ glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA,
+ p_vout->output.i_width, p_vout->output.i_height, 0,
+ GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
+ PP_OUTPUTPICTURE[0]->p_data );
+
+ initDone = 1;
+}
+
+- (void) reloadTexture
+{
+ if( !initDone )
+ {
+ return;
+ }
+
+ [currentContext makeCurrentContext];
+
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+
+ /* 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,
+ PP_OUTPUTPICTURE[0]->p_data );
+}
+
+- (void) goFullScreen
+{
+ /* Create the new pixel format */
+ NSOpenGLPixelFormatAttribute attribs[] =
+ {
+ NSOpenGLPFAAccelerated,
+ NSOpenGLPFANoRecovery,
+ NSOpenGLPFADoubleBuffer,
+ NSOpenGLPFAColorSize, 24,
+ NSOpenGLPFAAlphaSize, 8,
+ NSOpenGLPFADepthSize, 24,
+ NSOpenGLPFAFullScreen,
+ NSOpenGLPFAScreenMask,
+ /* TODO handle macosx-vdev */
+ CGDisplayIDToOpenGLDisplayMask( kCGDirectMainDisplay ),
+ 0
+ };
+ NSOpenGLPixelFormat * fmt = [[NSOpenGLPixelFormat alloc]
+ initWithAttributes: attribs];
+ if( !fmt )
+ {
+ msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" );
+ return;
+ }
+
+ /* Create the new OpenGL context */
+ fullScreenContext = [[NSOpenGLContext alloc]
+ initWithFormat: fmt shareContext: nil];
+ if( !fullScreenContext )
+ {
+ msg_Warn( p_vout, "Failed to create new NSOpenGLContext" );
+ return;
+ }
+ currentContext = fullScreenContext;
+
+ /* Capture display, switch to fullscreen */
+ if( CGCaptureAllDisplays() != CGDisplayNoErr )
+ {
+ msg_Warn( p_vout, "CGCaptureAllDisplays() failed" );
+ return;
+ }
+ [fullScreenContext setFullScreen];
+ [fullScreenContext makeCurrentContext];
+
+ /* Ratio */
+ unsigned width = CGDisplayPixelsWide( kCGDirectMainDisplay );
+ unsigned height = CGDisplayPixelsHigh( kCGDirectMainDisplay );
+ int stretch = config_GetInt( p_vout, "macosx-stretch" );
+ int fill = config_GetInt( p_vout, "macosx-fill" );
+ int bigRatio = ( height * p_vout->output.i_aspect <
+ width * VOUT_ASPECT_FACTOR );
+ if( stretch )
+ {
+ f_x = 1.0;
+ f_y = 1.0;
+ }
+ else if( ( bigRatio && !fill ) || ( !bigRatio && fill ) )
+ {
+ f_x = (float) height * p_vout->output.i_aspect /
+ width / VOUT_ASPECT_FACTOR;
+ f_y = 1.0;
+ }
+ else
+ {
+ f_x = 1.0;
+ f_y = (float) width * VOUT_ASPECT_FACTOR /
+ p_vout->output.i_aspect / height;
+ }
+
+ /* Update viewport, re-init textures */
+ glViewport( 0, 0, width, height );
+ [self initTextures];
+
+ /* Redraw the last picture */
+ [self setNeedsDisplay: YES];
+
+ isFullScreen = 1;
+}
+
+- (void) exitFullScreen
+{
+ /* Free current OpenGL context */
+ [NSOpenGLContext clearCurrentContext];
+ [fullScreenContext clearDrawable];
+ [fullScreenContext release];
+ CGReleaseAllDisplays();
+
+ currentContext = [self openGLContext];
+ [self initTextures];
+ [self reshape];
+
+ /* Redraw the last picture */
+ [self setNeedsDisplay: YES];
+
+ isFullScreen = 0;
+}
+
+- (void) cleanUp
+{
+ if( isFullScreen )
+ {
+ [self exitFullScreen];
+ }
+ 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();
+}
+
+- (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();
+}
+
+- (void) drawRect: (NSRect) rect
+{
+ [currentContext makeCurrentContext];
+
+ /* 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 );
+
+ /* Black background */
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+ if( !initDone )
+ {
+ [currentContext flushBuffer];
+ return;
+ }
+
+ /* Draw */
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+ if( i_effect & ( OPENGL_EFFECT_CUBE |
+ OPENGL_EFFECT_TRANSPARENT_CUBE ) )
+ {
+ glRotatef( 1.0, 0.3, 0.5, 0.7 );
+ [self drawCube];
+ }
+ else
+ {
+ [self drawQuad];
+ }
+
+ /* Wait for the job to be done */
+ [currentContext flushBuffer];
}
@end
- (void)createWindow:(NSValue *)o_value
{
vlc_value_t val;
- VLCView * o_view;
+ VLCQTView * 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 = (vout_thread_t *)[o_value pointerValue];
}
else
{
- unsigned int i_index = 0;
NSArray *o_screens = [NSScreen screens];
-
- if( !sscanf( val.psz_string, _("Screen %d"), &i_index ) ||
- [o_screens count] < i_index )
+ unsigned int i_index = val.i_int;
+
+ if( [o_screens count] < i_index )
{
o_screen = [NSScreen mainScreen];
b_main_screen = 1;
o_screen = [o_screens objectAtIndex: i_index];
config_PutInt( p_vout, "macosx-vdev", i_index );
b_main_screen = (i_index == 0);
- }
-
- free( val.psz_string );
+ }
}
- if( p_vout->b_fullscreen )
+ if( p_vout->b_fullscreen && !p_vout->p_sys->i_opengl )
{
NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0;
backing: NSBackingStoreBuffered
defer: NO screen: o_screen];
- [p_vout->p_sys->o_window setLevel: NSModalPanelWindowLevel];
- p_vout->p_sys->b_mouse_moved = 1;
+ //[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 |
- NSTexturedBackgroundWindowMask;
+ NSResizableWindowMask;
- /* 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;
-
- 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;
+ if( !p_vout->p_sys->i_opengl )
+ {
+ 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
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, "video-on-top" ) )
+ {
+ [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ }
+
if( !p_vout->p_sys->b_pos_saved )
{
[p_vout->p_sys->o_window center];
}
}
- 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];
-
-
- if( p_playlist == NULL )
+ if( !p_vout->p_sys->i_opengl )
{
- 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)
- {
- [p_vout->p_sys->o_window setTitle: o_title];
- [p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
+ o_view = [[VLCQTView 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];
}
else
{
- [p_vout->p_sys->o_window setTitle:
- [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]];
- [p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
+#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];
+
}
- (void)destroyWindow:(NSValue *)o_value
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 = 1;
+ p_vout->p_sys->b_pos_saved = YES;
}
- 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;
- }
-
+
p_vout->p_sys->p_qdport = nil;
[p_vout->p_sys->o_window close];
p_vout->p_sys->o_window = nil;