X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvoutgl.m;h=47ebd9278356979fd9a432deffe413d778576116;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=83cea510c783c57ac8b71a7563eb338b5e8710c2;hpb=3305b049e7f587b23359a1c9047fb5763d19c1dc;p=vlc diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index 83cea510c7..47ebd92783 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -73,7 +73,7 @@ struct vout_sys_t WindowRef theWindow; WindowGroupRef winGroup; vlc_bool_t b_clipped_out; - Rect clipBounds, viewBounds; + Rect clipBounds, viewBounds; }; /***************************************************************************** @@ -121,7 +121,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this ) 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, @@ -144,7 +144,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this ) 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 ) @@ -340,7 +340,7 @@ static void Unlock( vout_thread_t * p_vout ) #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 @@ -351,7 +351,7 @@ static void Unlock( vout_thread_t * p_vout ) { p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout subView: o_glview frame: nil]; - + } #undef o_glview } @@ -488,9 +488,9 @@ static int aglInit( vout_thread_t * p_vout ) { 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); @@ -539,7 +539,7 @@ static void aglReshape( vout_thread_t * p_vout ) 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 ); @@ -560,7 +560,7 @@ static void aglReshape( vout_thread_t * p_vout ) } /* private event class */ -enum +enum { kEventClassVLCPlugin = 'vlcp', }; @@ -608,7 +608,7 @@ static int aglManage( vout_thread_t * p_vout ) { /* 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 ); @@ -641,10 +641,10 @@ static int aglManage( vout_thread_t * p_vout ) else { Rect deviceRect; - + GDHandle deviceHdl = GetMainDevice(); deviceRect = (*deviceHdl)->gdRect; - + if( !p_vout->p_sys->theWindow ) { /* Create a window */ @@ -654,7 +654,7 @@ static int aglManage( vout_thread_t * p_vout ) | kWindowStandardHandlerAttribute | kWindowLiveResizeAttribute | kWindowNoShadowAttribute; - + windowAttrs &= (~kWindowResizableAttribute); CreateNewWindow(kDocumentWindowClass, windowAttrs, &deviceRect, &p_vout->p_sys->theWindow); @@ -664,14 +664,14 @@ static int aglManage( vout_thread_t * p_vout ) 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 }, @@ -723,8 +723,8 @@ static int aglControl( vout_thread_t *p_vout, int i_query, va_list args ) 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 @@ -834,7 +834,7 @@ static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBou 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); } @@ -844,7 +844,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event { 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); @@ -852,7 +852,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event { HICommand theHICommand; GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, sizeof( HICommand ), NULL, &theHICommand ); - + switch ( theHICommand.commandID ) { default: @@ -863,13 +863,13 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event { 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) { @@ -877,7 +877,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event case kEventWindowZoomed: case kEventWindowBoundsChanged: break; - + default: result = eventNotHandledErr; } @@ -889,7 +889,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event case kEventMouseDown: { UInt16 button; - + GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button); switch (button) { @@ -929,7 +929,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event case kEventMouseUp: { UInt16 button; - + GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button); switch (button) { @@ -990,10 +990,10 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event 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 ); @@ -1008,7 +1008,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event break; } - + default: result = eventNotHandledErr; } @@ -1052,7 +1052,7 @@ 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 + * then we retrieve and use the matching CGL context */ aglSetCurrentContext(p_vout->p_sys->agl_ctx); return kCGLNoError != CGLLockContext( CGLGetCurrentContext() ); @@ -1076,7 +1076,7 @@ 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 + * therefore, we use the current CGL context */ CGLUnlockContext( CGLGetCurrentContext() ); #else