From 38d29c487c2fba8aa0c568b5f2d346498b985e39 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 22 Jan 2014 00:26:01 +0100 Subject: vo: merge get rid of vo.aspdat field Rename vo_get_src_dst_rects() to mp_get_src_dst_rects() and make it independent from the VO (it takes a comical amount of parameters now to pass all required state). Add a convenience wrapper with the name vo_get_src_dst_rects() to vo.c. Replace all aspdat and vo usages with immediate parameters. Functionally, nothing should change, except that the window size is clamped to a minimum of size 1 much earlier, and some log messages change the prefix (don't bother with vo.vo_log stuff). --- video/out/cocoa_common.m | 3 --- 1 file changed, 3 deletions(-) (limited to 'video/out/cocoa_common.m') diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 25a4bed193..5780af3bdc 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -57,8 +57,6 @@ struct vo_cocoa_state { NSInteger window_level; - struct aspect_data aspdat; - bool did_resize; bool skip_next_swap_buffer; bool inside_sync_section; @@ -388,7 +386,6 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t width, uint32_t height, dispatch_sync(dispatch_get_main_queue(), ^{ s->inside_sync_section = true; s->enable_resize_redraw = false; - s->aspdat = vo->aspdat; bool reset_size = s->old_dwidth != width || s->old_dheight != height; s->old_dwidth = width; -- cgit v1.2.3