From 6d0f0546ee851f4106438c5b92c8d1d152937ea7 Mon Sep 17 00:00:00 2001 From: der richter Date: Sun, 29 Sep 2019 18:35:12 +0200 Subject: cocoa-cb: remove get_property_* usages and split up mpv helper all the get_property_* usages were removed because in some circumstances they can lead to deadlocks. they were replaced by accessing the vo and mp_vo_opts structs directly, like on other vos. additionally the mpv helper was split into a mpv and libmpv helper, to differentiate between private and public APIs and for future changes like a macOS vulkan context for vo=gpu. --- wscript_build.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 95cba8391e..61cb25b7a5 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -163,9 +163,11 @@ def build(ctx): if ctx.dependency_satisfied('macos-cocoa-cb'): swift_source = [ - ( "osdep/macOS_mpv_helper.swift" ), - ( "osdep/macOS_swift_extensions.swift" ), - ( "osdep/macOS_swift_compat.swift" ), + ( "osdep/macos/log_helper.swift" ), + ( "osdep/macos/libmpv_helper.swift" ), + ( "osdep/macos/mpv_helper.swift" ), + ( "osdep/macos/swift_extensions.swift" ), + ( "osdep/macos/swift_compat.swift" ), ( "video/out/cocoa-cb/events_view.swift" ), ( "video/out/cocoa-cb/video_layer.swift" ), ( "video/out/cocoa-cb/window.swift" ), -- cgit v1.2.3