/*****************************************************************************
* voutgl.m: MacOS X OpenGL provider
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2004, 2007 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <vlc_keys.h>
vout_thread_t * p_vout;
}
-+ (void)resetVout: (vout_thread_t *)p_vout;
++ (void)resetVout: (vout_thread_t *) p_vout;
- (id) initWithVout: (vout_thread_t *) p_vout;
@end
WindowRef theWindow;
WindowGroupRef winGroup;
vlc_bool_t b_clipped_out;
- Rect clipBounds, viewBounds;
+ Rect clipBounds, viewBounds;
};
/*****************************************************************************
var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
if( value_drawable.i_int != 0 )
{
- static const GLint ATTRIBUTES[] = {
+ static const GLint ATTRIBUTES[] = {
AGL_WINDOW,
AGL_RGBA,
AGL_NO_RECOVERY,
msg_Err( p_vout, "no screen renderer available for required attributes." );
return VLC_EGENERIC;
}
-
+
p_vout->p_sys->agl_ctx = aglCreateContext(pixFormat, NULL);
aglDestroyPixelFormat(pixFormat);
if( NULL == p_vout->p_sys->agl_ctx )
[o_pool release];
- /* Check to see if fillVoutWithNewView: was successfull */
+ /* Check to see if initVout: was successfull */
if( !p_vout->p_sys->o_vout_view )
{
switch( i_query )
{
case VOUT_SET_STAY_ON_TOP:
- b_arg = va_arg( args, vlc_bool_t );
+ b_arg = (bool) va_arg( args, int );
[p_vout->p_sys->o_vout_view setOnTop: b_arg];
return VLC_SUCCESS;
}
/* This function will reset the o_vout_view. It's useful to go fullscreen. */
-+ (void)resetVout:(NSData *)arg
++ (void)resetVout:(vout_thread_t *) p_vout
{
- vout_thread_t * p_vout = [arg pointerValue];
-
if( p_vout->b_fullscreen )
{
/* Save window size and position */
#define o_glview p_vout->p_sys->o_glview
o_glview = [[VLCGLView alloc] initWithVout: p_vout];
[o_glview autorelease];
-
+
if( p_vout->p_sys->b_saved_frame )
{
p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
{
p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
subView: o_glview frame: nil];
-
+
}
#undef o_glview
}
/* 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 );
+ GLint params[] = { 1 };
+ CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, params );
return self;
}
{
vlc_value_t val;
- Rect viewBounds;
+ Rect viewBounds;
Rect clipBounds;
-
+
var_Get( p_vout->p_libvlc, "drawable", &val );
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
unsigned int i_height = p_vout->p_sys->i_height;
unsigned int i_width = p_vout->p_sys->i_width;
- vout_PlacePicture(p_vout, i_width, i_height, &x, &y, &i_width, &i_height);
+ vout_PlacePicture(p_vout, i_width, i_height, &x, &y, &i_width, &i_height);
glViewport( p_vout->p_sys->i_offx + x, p_vout->p_sys->i_offy + y, i_width, i_height );
}
/* private event class */
-enum
+enum
{
kEventClassVLCPlugin = 'vlcp',
};
{
/* Close the fullscreen window and resume normal drawing */
vlc_value_t val;
- Rect viewBounds;
+ Rect viewBounds;
Rect clipBounds;
var_Get( p_vout->p_libvlc, "drawable", &val );
else
{
Rect deviceRect;
-
+
GDHandle deviceHdl = GetMainDevice();
deviceRect = (*deviceHdl)->gdRect;
-
+
if( !p_vout->p_sys->theWindow )
{
/* Create a window */
| kWindowStandardHandlerAttribute
| kWindowLiveResizeAttribute
| kWindowNoShadowAttribute;
-
+
windowAttrs &= (~kWindowResizableAttribute);
CreateNewWindow(kDocumentWindowClass, windowAttrs, &deviceRect, &p_vout->p_sys->theWindow);
SetWindowGroup(p_vout->p_sys->theWindow, p_vout->p_sys->winGroup);
SetWindowGroupParent( p_vout->p_sys->winGroup, GetWindowGroupOfClass(kDocumentWindowClass) ) ;
}
-
+
// Window title
CFStringRef titleKey = CFSTR("Fullscreen VLC media plugin");
CFStringRef windowTitle = CFCopyLocalizedString(titleKey, NULL);
SetWindowTitleWithCFString(p_vout->p_sys->theWindow, windowTitle);
CFRelease(titleKey);
CFRelease(windowTitle);
-
+
//Install event handler
static const EventTypeSpec win_events[] = {
{ kEventClassMouse, kEventMouseDown },
clipBounds.left = va_arg( args, int);
clipBounds.bottom = va_arg( args, int);
clipBounds.right = va_arg( args, int);
-
- if( !p_vout->b_fullscreen )
+
+ if( !p_vout->b_fullscreen )
{
/*
** check that the clip rect is not empty, as this is used
p_vout->p_sys->i_height = viewBounds.bottom-viewBounds.top;
p_vout->p_sys->i_offx = -clipBounds.left - viewBounds.left;
p_vout->p_sys->i_offy = clipBounds.bottom + viewBounds.top
- - p_vout->p_sys->i_height;
+ - p_vout->p_sys->i_height;
aglUpdateContext(p_vout->p_sys->agl_ctx);
}
{
OSStatus result = noErr;
UInt32 class = GetEventClass (event);
- UInt32 kind = GetEventKind (event);
+ UInt32 kind = GetEventKind (event);
vout_thread_t *p_vout = (vout_thread_t *)userData;
result = CallNextEventHandler(nextHandler, event);
{
HICommand theHICommand;
GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, sizeof( HICommand ), NULL, &theHICommand );
-
+
switch ( theHICommand.commandID )
{
default:
{
WindowRef window;
Rect rectPort = {0,0,0,0};
-
+
GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
if(window)
{
GetPortBounds(GetWindowPort(window), &rectPort);
- }
+ }
switch (kind)
{
case kEventWindowZoomed:
case kEventWindowBoundsChanged:
break;
-
+
default:
result = eventNotHandledErr;
}
case kEventMouseDown:
{
UInt16 button;
-
+
GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button);
switch (button)
{
case kEventMouseUp:
{
UInt16 button;
-
+
GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button);
switch (button)
{
unsigned int i_height = p_vout->p_sys->i_height;
unsigned int i_width = p_vout->p_sys->i_width;
- vout_PlacePicture(p_vout, i_width, i_height, &i_x, &i_y, &i_width, &i_height);
+ vout_PlacePicture(p_vout, i_width, i_height, &i_x, &i_y, &i_width, &i_height);
GetEventParameter(event, kEventParamWindowMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &ml);
-
+
val.i_int = ( ((int)ml.h) - i_x ) *
p_vout->render.i_width / i_width;
var_Set( p_vout, "mouse-x", val );
break;
}
-
+
default:
result = eventNotHandledErr;
}
static int aglLock( vout_thread_t * p_vout )
{
-#ifdef __ppc__
- /*
- * before 10.4, we set the AGL context as current and
- * then we retrieve and use the matching CGL context
- */
- aglSetCurrentContext(p_vout->p_sys->agl_ctx);
- return kCGLNoError != CGLLockContext( CGLGetCurrentContext() );
-#else
- /* since 10.4, this is the safe way to get the underlying CGL context */
+ /* get the underlying CGL context */
CGLContextObj cglContext;
if( aglGetCGLContext(p_vout->p_sys->agl_ctx, (void**)&cglContext) )
{
}
}
return 1;
-#endif
}
static void aglUnlock( vout_thread_t * p_vout )
{
-#ifdef __ppc__
- /*
- * before 10.4, we assume that the AGL context is current.
- * therefore, we use the current CGL context
- */
- CGLUnlockContext( CGLGetCurrentContext() );
-#else
- /* since 10.4, this is the safe way to get the underlying CGL context */
+ /* get the underlying CGL context */
CGLContextObj cglContext;
if( aglGetCGLContext(p_vout->p_sys->agl_ctx, (void**)&cglContext) )
{
CGLUnlockContext( cglContext );
}
-#endif
}
projects / vlc / blobdiff