summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa_common.m
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-22 00:26:01 +0100
committerwm4 <wm4@nowhere>2014-01-22 00:35:52 +0100
commit38d29c487c2fba8aa0c568b5f2d346498b985e39 (patch)
treed24d9a457788409953ba5a493b3f18c47e121a05 /video/out/cocoa_common.m
parent0f2acd4a80be53638c19bfee2fcac2e72c06fa29 (diff)
downloadmpv-38d29c487c2fba8aa0c568b5f2d346498b985e39.tar.bz2
mpv-38d29c487c2fba8aa0c568b5f2d346498b985e39.tar.xz
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).
Diffstat (limited to 'video/out/cocoa_common.m')
-rw-r--r--video/out/cocoa_common.m3
1 files changed, 0 insertions, 3 deletions
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;