Adding upstream version 0.38.0.upstream/0.38.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/osdep/macos/precise_timer.swift b/osdep/mac/precise_timer.swift
index f4ad3bb..d4837f9 100644
--- a/osdep/macos/precise_timer.swift
+++ b/osdep/mac/precise_timer.swift
@@ -24,7 +24,6 @@ struct Timing {
 
 class PreciseTimer {
     unowned var common: Common
-    var mpv: MPVHelper? { get { return common.mpv } }
 
     let nanoPerSecond: Double = 1e+9
     let machToNano: Double = {
@@ -59,9 +58,9 @@ class PreciseTimer {
     init?(common com: Common) {
         common = com
 
-        pthread_create(&thread, &threadAttr, entryC, MPVHelper.bridge(obj: self))
+        pthread_create(&thread, &threadAttr, entryC, TypeHelper.bridge(obj: self))
         if thread == nil {
-            common.log.sendWarning("Couldn't create pthread for high precision timer")
+            common.log.warning("Couldn't create pthread for high precision timer")
             return nil
         }
 
@@ -85,7 +84,7 @@ class PreciseTimer {
 
         isHighPrecision = success == KERN_SUCCESS
         if !isHighPrecision {
-            common.log.sendWarning("Couldn't create a high precision timer")
+            common.log.warning("Couldn't create a high precision timer")
         }
     }
 
@@ -119,7 +118,7 @@ class PreciseTimer {
     let threadSignal: @convention(c) (Int32) -> () = { (sig: Int32) in }
 
     let entryC: @convention(c) (UnsafeMutableRawPointer) -> UnsafeMutableRawPointer? = { (ptr: UnsafeMutableRawPointer) in
-        let ptimer: PreciseTimer = MPVHelper.bridge(ptr: ptr)
+        let ptimer: PreciseTimer = TypeHelper.bridge(ptr: ptr)
         ptimer.entry()
         return nil
     }