diff options
| author | der richter <der.richter@gmx.de> | 2019-09-29 18:35:12 +0200 |
|---|---|---|
| committer | der richter <der.richter@gmx.de> | 2019-10-06 13:29:48 +0200 |
| commit | 6d0f0546ee851f4106438c5b92c8d1d152937ea7 (patch) | |
| tree | f4efc2a603081fe75c19bea86c261d5320716c5b /wscript_build.py | |
| parent | 2b19a7c964b821945e3ea06cfa81c1c064f2504d (diff) | |
| download | mpv-6d0f0546ee851f4106438c5b92c8d1d152937ea7.tar.bz2 mpv-6d0f0546ee851f4106438c5b92c8d1d152937ea7.tar.xz | |
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.
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 8 |
1 files changed, 5 insertions, 3 deletions
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" ), |