Skip to content

V
vlc-1.1
Commit 96be7aba authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

macosx: cleanup

parent aeb990e6
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 43 deletions
modules/gui/macosx/voutgl.m
View file @ 96be7aba
...@@ -414,13 +414,11 @@ static void Unlock( vout_thread_t * p_vout ) ...@@ -414,13 +414,11 @@ static void Unlock( vout_thread_t * p_vout )
- (void) reshape - (void) reshape
{ {
int x, y; int x, y;
vlc_value_t val;
Lock( p_vout ); Lock( p_vout );
NSRect bounds = [self bounds]; NSRect bounds = [self bounds];
var_Get( p_vout, "macosx-stretch", &val ); if( var_GetBool( p_vout, "macosx-stretch" ) )
if( val.b_bool )
{ {
x = bounds.size.width; x = bounds.size.width;
y = bounds.size.height; y = bounds.size.height;
...@@ -494,31 +492,21 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve ...@@ -494,31 +492,21 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve
static int aglInit( vout_thread_t * p_vout ) static int aglInit( vout_thread_t * p_vout )
{ {
vlc_value_t val;
Rect viewBounds; Rect viewBounds;
Rect clipBounds; Rect clipBounds;
var_Get( p_vout->p_libvlc, "drawable-agl", &val ); p_vout->p_sys->agl_drawable = (AGLDrawable)
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int; var_GetInteger( p_vout->p_libvlc, "drawable-agl" );
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable); aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
var_Get( p_vout->p_libvlc, "drawable-view-top", &val ); viewBounds.top = var_GetInteger( p_vout->p_libvlc, "drawable-view-top" );
viewBounds.top = val.i_int; viewBounds.left = var_GetInteger( p_vout->p_libvlc, "drawable-view-left" );
var_Get( p_vout->p_libvlc, "drawable-view-left", &val ); viewBounds.bottom = var_GetInteger( p_vout->p_libvlc, "drawable-view-bottom" );
viewBounds.left = val.i_int; viewBounds.right = var_GetInteger( p_vout->p_libvlc, "drawable-view-right" );
var_Get( p_vout->p_libvlc, "drawable-view-bottom", &val ); clipBounds.top = var_GetInteger( p_vout->p_libvlc, "drawable-clip-top" );
viewBounds.bottom = val.i_int; clipBounds.left = var_GetInteger( p_vout->p_libvlc, "drawable-clip-left" );
var_Get( p_vout->p_libvlc, "drawable-view-right", &val ); clipBounds.bottom = var_GetInteger( p_vout->p_libvlc, "drawable-clip-bottom" );
viewBounds.right = val.i_int; clipBounds.right = var_GetInteger( p_vout->p_libvlc, "drawable-clip-right" );
var_Get( p_vout->p_libvlc, "drawable-clip-top", &val );
clipBounds.top = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-left", &val );
clipBounds.left = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-bottom", &val );
clipBounds.bottom = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-right", &val );
clipBounds.right = val.i_int;
p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom) p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom)
|| (clipBounds.left == clipBounds.right); || (clipBounds.left == clipBounds.right);
...@@ -615,30 +603,22 @@ static int aglManage( vout_thread_t * p_vout ) ...@@ -615,30 +603,22 @@ static int aglManage( vout_thread_t * p_vout )
if( p_vout->b_fullscreen ) if( p_vout->b_fullscreen )
{ {
/* Close the fullscreen window and resume normal drawing */ /* Close the fullscreen window and resume normal drawing */
vlc_value_t val;
Rect viewBounds; Rect viewBounds;
Rect clipBounds; Rect clipBounds;
var_Get( p_vout->p_libvlc, "drawable-agl", &val ); p_vout->p_sys->agl_drawable = (AGLDrawable)
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int; var_GetInteger( p_vout->p_libvlc, "drawable-agl" );
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable); aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
var_Get( p_vout->p_libvlc, "drawable-view-top", &val ); viewBounds.top = var_GetInteger( p_vout->p_libvlc, "drawable-view-top" );
viewBounds.top = val.i_int; viewBounds.left = var_GetInteger( p_vout->p_libvlc, "drawable-view-left" );
var_Get( p_vout->p_libvlc, "drawable-view-left", &val ); viewBounds.bottom = var_GetInteger( p_vout->p_libvlc, "drawable-view-bottom" );
viewBounds.left = val.i_int; viewBounds.right = var_GetInteger( p_vout->p_libvlc, "drawable-view-right" );
var_Get( p_vout->p_libvlc, "drawable-view-bottom", &val ); clipBounds.top = var_GetInteger( p_vout->p_libvlc, "drawable-clip-top" );
viewBounds.bottom = val.i_int; clipBounds.left = var_GetInteger( p_vout->p_libvlc, "drawable-clip-left" );
var_Get( p_vout->p_libvlc, "drawable-view-right", &val ); clipBounds.bottom = var_GetInteger( p_vout->p_libvlc, "drawable-clip-bottom" );
viewBounds.right = val.i_int; clipBounds.right = var_GetInteger( p_vout->p_libvlc, "drawable-clip-right" );
var_Get( p_vout->p_libvlc, "drawable-clip-top", &val );
clipBounds.top = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-left", &val );
clipBounds.left = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-bottom", &val );
clipBounds.bottom = val.i_int;
var_Get( p_vout->p_libvlc, "drawable-clip-right", &val );
clipBounds.right = val.i_int;
aglSetCurrentContext(p_vout->p_sys->agl_ctx); aglSetCurrentContext(p_vout->p_sys->agl_ctx);
aglSetViewport(p_vout, viewBounds, clipBounds); aglSetViewport(p_vout, viewBounds, clipBounds);
...@@ -823,6 +803,7 @@ static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBou ...@@ -823,6 +803,7 @@ static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBou
- clipBounds.bottom; // from window bottom edge - clipBounds.bottom; // from window bottom edge
rect[2] = clipBounds.right-clipBounds.left; // width rect[2] = clipBounds.right-clipBounds.left; // width
rect[3] = clipBounds.bottom-clipBounds.top; // height rect[3] = clipBounds.bottom-clipBounds.top; // height
aglSetInteger(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT, rect); aglSetInteger(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT, rect);
aglEnable(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT); aglEnable(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT);
...@@ -1068,4 +1049,3 @@ static void aglUnlock( vout_thread_t * p_vout ) ...@@ -1068,4 +1049,3 @@ static void aglUnlock( vout_thread_t * p_vout )
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment