From cdfbbcbf8ae01024fd7a429a572c15eefa41e779 Mon Sep 17 00:00:00 2001 From: ronaldheft Date: Tue, 20 Sep 2022 18:34:43 -0400 Subject: [PATCH] refactor: Use refactored seek back time class --- ios/App/Shared/player/AudioPlayer.swift | 28 +------------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 750bb03b..7a215a2a 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -289,8 +289,7 @@ class AudioPlayer: NSObject { } // Determine where we are starting playback - let lastPlayed = (session.updatedAt ?? 0)/1000 - let currentTime = allowSeekBack ? calculateSeekBackTimeAtCurrentTime(session.currentTime, lastPlayed: lastPlayed) : session.currentTime + let currentTime = allowSeekBack ? PlayerTimeUtils.calcSeekBackTime(currentTime: session.currentTime, lastPlayedMs: session.updatedAt) : session.currentTime // Sync our new playback position Task { await PlayerProgress.shared.syncFromPlayer(currentTime: currentTime, includesPlayProgress: self.isPlaying(), isStopping: false) } @@ -307,31 +306,6 @@ class AudioPlayer: NSObject { } } - private func calculateSeekBackTimeAtCurrentTime(_ currentTime: Double, lastPlayed: Double) -> Double { - let difference = Date().timeIntervalSince1970 - lastPlayed - var time: Double = 0 - - // Scale seek back time based on how long since last play - if lastPlayed == 0 { - time = 5 - } else if difference < 6 { - time = 2 - } else if difference < 12 { - time = 10 - } else if difference < 30 { - time = 15 - } else if difference < 180 { - time = 20 - } else if difference < 3600 { - time = 25 - } else { - time = 29 - } - - // Wind the clock back - return currentTime - time - } - private func resumePlayback() { logger.log("PLAY: Resuming playback")