summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2024-03-26 23:21:34 +0100
committerder richter <der.richter@gmx.de>2024-03-29 14:20:40 +0100
commite7df95b10d76d62e3feb40b0b38469b3b1d20461 (patch)
tree0607f786cc91d2f6dc3eb23ab5ee1198067af895 /osdep
parente71e340b77c65b71510a74b69d262ca9e3ee8032 (diff)
downloadmpv-e7df95b10d76d62e3feb40b0b38469b3b1d20461.tar.bz2
mpv-e7df95b10d76d62e3feb40b0b38469b3b1d20461.tar.xz
mac: rename mpvHandle to mpv
Diffstat (limited to 'osdep')
-rw-r--r--osdep/mac/event_helper.swift8
-rw-r--r--osdep/mac/libmpv_helper.swift10
2 files changed, 9 insertions, 9 deletions
diff --git a/osdep/mac/event_helper.swift b/osdep/mac/event_helper.swift
index fa2cd8e01e..7170136478 100644
--- a/osdep/mac/event_helper.swift
+++ b/osdep/mac/event_helper.swift
@@ -62,15 +62,15 @@ class EventHelper {
var mpv: OpaquePointer?
var events: [String:[Int:EventSubscriber]] = [:]
- init?(_ appHub: AppHub, _ mpvHandle: OpaquePointer) {
+ init?(_ appHub: AppHub, _ mpv: OpaquePointer) {
if !appHub.isApplication {
- mpv_destroy(mpvHandle)
+ mpv_destroy(mpv)
return nil
}
self.appHub = appHub
- self.mpv = mpvHandle
- mpv_set_wakeup_callback(mpvHandle, wakeup, TypeHelper.bridge(obj: self))
+ self.mpv = mpv
+ mpv_set_wakeup_callback(mpv, wakeup, TypeHelper.bridge(obj: self))
}
func subscribe(_ subscriber: any EventSubscriber, event: Event) {
diff --git a/osdep/mac/libmpv_helper.swift b/osdep/mac/libmpv_helper.swift
index 4be6ee6e45..61cac8e74c 100644
--- a/osdep/mac/libmpv_helper.swift
+++ b/osdep/mac/libmpv_helper.swift
@@ -23,13 +23,13 @@ let glDummy: @convention(c) () -> Void = {}
class LibmpvHelper {
var log: LogHelper
- var mpvHandle: OpaquePointer?
+ var mpv: OpaquePointer?
var mpvRenderContext: OpaquePointer?
var fbo: GLint = 1
let uninitLock = NSLock()
init(_ mpv: OpaquePointer, _ mpLog: OpaquePointer?) {
- mpvHandle = mpv
+ self.mpv = mpv
log = LogHelper(mpLog)
}
@@ -47,7 +47,7 @@ class LibmpvHelper {
mpv_render_param()
]
- if (mpv_render_context_create(&mpvRenderContext, mpvHandle, &params) < 0) {
+ if (mpv_render_context_create(&mpvRenderContext, mpv, &params) < 0) {
log.sendError("Render context init has failed.")
exit(1)
}
@@ -174,8 +174,8 @@ class LibmpvHelper {
uninitLock.lock()
mpv_render_context_free(mpvRenderContext)
mpvRenderContext = nil
- mpv_destroy(mpvHandle)
- mpvHandle = nil
+ mpv_destroy(mpv)
+ mpv = nil
uninitLock.unlock()
}
}