RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mac: properly guard and unwrap an optional value 

i don't know what i was thinking there, but force unwrapping is a very
bad idea.
This commit is contained in:
der richter 2020-07-26 13:34:34 +02:00
parent f79a591ae4
commit fa982a7cbe
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
video/out/mac/common.swift
View File

@ -437,34 +437,38 @@ class Common: NSObject {
events.pointee |= Int32(checkEvents())
return VO_TRUE
case VOCTRL_VO_OPTS_CHANGED:
var opt: UnsafeMutableRawPointer?
while mpv.nextChangedConfig(property: &opt) {
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.border) {
var o: UnsafeMutableRawPointer?
while mpv.nextChangedConfig(property: &o) {
guard let opt = o else {
log.sendError("No changed options was retrieved")
return VO_TRUE
}
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.border) {
DispatchQueue.main.async {
self.window?.border = Bool(mpv.opts.border)
}
}
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.fullscreen) {
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.fullscreen) {
DispatchQueue.main.async {
self.window?.toggleFullScreen(nil)
}
}
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.ontop) {
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.ontop) {
DispatchQueue.main.async {
self.window?.setOnTop(Bool(mpv.opts.ontop), Int(mpv.opts.ontop_level))
}
}
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.keepaspect_window) {
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.keepaspect_window) {
DispatchQueue.main.async {
self.window?.keepAspect = Bool(mpv.opts.keepaspect_window)
}
}
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_minimized) {
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_minimized) {
DispatchQueue.main.async {
self.window?.setMinimized(Bool(mpv.opts.window_minimized))
}
}
if opt! == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_maximized) {
if opt == UnsafeMutableRawPointer(&mpv.optsPtr.pointee.window_maximized) {
DispatchQueue.main.async {
self.window?.setMaximized(Bool(mpv.opts.window_maximized))
}