Swift5 update, asset playback premature cutoff temp fix (roundware#34)

* auto-update to Swift 5 * add arbitrary 1.5s to asset playback duration to compensate for timer and audio playback being out-of-sync - effective hack, but only temporary * clean-up
hburgund · Jul 30, 2019 · b94b773 · b94b773
1 parent 6dc45a1
commit b94b773
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/RWFramework/RWFramework/Playlist/AudioTrack.swift b/RWFramework/RWFramework/Playlist/AudioTrack.swift
@@ -395,7 +395,7 @@ private class PlayingAsset: TimedTrackState {
         self.asset = asset
         fadeOutDuration = min(Double(track.fadeOutTime.random()), duration / 2)
         // duration of the asset excluding any fades
-        let fullVolumeDuration = duration - fadeOutDuration
+        let fullVolumeDuration = duration - fadeOutDuration + 1.5
         super.init(duration: fullVolumeDuration)
     }
 

diff --git a/RWFramework/RWFramework/RWFrameworkAPI.swift b/RWFramework/RWFramework/RWFrameworkAPI.swift
@@ -588,7 +588,7 @@ extension RWFramework {
             return try Speaker.from(data: data)
         }.catch { error in
             self.rwGetSpeakersFailure(error)
-            self.apiProcessError(nil, error: error, caller: "apiGetAssets")
+            self.apiProcessError(nil, error: error, caller: "apiGetSpeakers")
         }
     }
 

diff --git a/RWFramework/RWFramework/RWFrameworkMedia.swift b/RWFramework/RWFramework/RWFrameworkMedia.swift
@@ -94,8 +94,8 @@ extension RWFramework {
         }
 
         func encode(with aCoder: NSCoder) {
-            aCoder.encode(MediaType.allCases.index(of: mediaType)!, forKey: "mediaType")
-            aCoder.encode(MediaStatus.allCases.index(of: mediaStatus)!, forKey: "mediaStatus")
+            aCoder.encode(MediaType.allCases.firstIndex(of: mediaType)!, forKey: "mediaType")
+            aCoder.encode(MediaStatus.allCases.firstIndex(of: mediaStatus)!, forKey: "mediaStatus")
             aCoder.encode(string, forKey: "string")
             aCoder.encode(desc, forKey: "desc")
             aCoder.encode(latitude, forKey: "latitude")