Release 2.8.0

Example/SwiftAudioPlayer/ViewController.swift

@@ -145,11 +145,9 @@ class ViewController: UIViewController {
             
             if self.duration == 0.0 { return }
             
-            let progress = Float((buffer.totalDurationBuffered + buffer.startingBufferTimePositon) / self.duration)
+            self.bufferProgress.progress = Float(buffer.bufferingProgress)
             
-            self.bufferProgress.progress = progress
-            
-            if progress >= 0.99 {
+            if buffer.bufferingProgress >= 0.99 {
                 self.streamButton.isEnabled = false
             }
             

Source/Engine/AudioDiskEngine.swift

@@ -64,7 +64,7 @@ class AudioDiskEngine: AudioEngine {
             audioSampleRate = Float(audioFormat?.sampleRate ?? 44100)
             audioLengthSeconds = Float(audioLengthSamples) / audioSampleRate
             duration = Duration(audioLengthSeconds)
-            bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: 0, durationLoadedByNetwork: duration, isPlayable: true)
+            bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: 0, durationLoadedByNetwork: duration, predictedDurationToLoad: duration, isPlayable: true)
         } else {
             Log.monitor("Could not load downloaded file with url: \(url)")
         }

Source/Engine/AudioEngine.swift

@@ -86,8 +86,8 @@ class AudioEngine: AudioEngineProtocol {
         }
     }
     
-    var bufferedSecondsDebouncer: SAAudioAvailabilityRange = SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, isPlayable: false)
-    var bufferedSeconds: SAAudioAvailabilityRange =  SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, isPlayable: false) {
+    var bufferedSecondsDebouncer: SAAudioAvailabilityRange = SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, predictedDurationToLoad: Double.greatestFiniteMagnitude, isPlayable: false)
+    var bufferedSeconds: SAAudioAvailabilityRange =  SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, predictedDurationToLoad: Double.greatestFiniteMagnitude, isPlayable: false) {
         didSet {
             if bufferedSeconds.startingNeedle == 0.0 && bufferedSeconds.durationLoadedByNetwork == 0.0 {
                 bufferedSecondsDebouncer = bufferedSeconds
@@ -154,7 +154,11 @@ class AudioEngine: AudioEngineProtocol {
     
     func updateIsPlaying() {
         if !bufferedSeconds.isPlayable {
-            playingStatus = .buffering
+            if bufferedSeconds.bufferingProgress == 1.0 {
+                playingStatus = .ended
+            } else {
+                playingStatus = .buffering
+            }
             return
         }
         

Source/Engine/AudioStreamEngine.swift

@@ -218,7 +218,7 @@ class AudioStreamEngine: AudioEngine {
         let range = converter.pollNetworkAudioAvailabilityRange()
         isPlayable = (numberOfBuffersScheduledInTotal >= MIN_BUFFERS_TO_BE_PLAYABLE && range.1 > 0) && predictedStreamDuration > 0
         Log.debug("loaded \(range), numberOfBuffersScheduledInTotal: \(numberOfBuffersScheduledInTotal), isPlayable: \(isPlayable)")
-        bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: range.0, durationLoadedByNetwork: range.1, isPlayable: isPlayable)
+        bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: range.0, durationLoadedByNetwork: range.1, predictedDurationToLoad: predictedStreamDuration, isPlayable: isPlayable)
     }
     
     private func updateNeedle() {
@@ -236,12 +236,6 @@ class AudioStreamEngine: AudioEngine {
         var currentTime = TimeInterval(playerTime.sampleTime) / playerTime.sampleRate
         currentTime = currentTime > 0 ? currentTime : 0
         
-        if currentTime > predictedStreamDuration {
-            Log.info("reached end of audio")
-            seek(toNeedle: 0)
-            pause()
-            playingStatus = .ended
-        }
         needle = (currentTime + currentTimeOffset)
     }
     

Source/Engine/SAAudioAvailabilityRange.swift

@@ -29,8 +29,15 @@ import Foundation
 public struct SAAudioAvailabilityRange {
     let startingNeedle: Needle
     let durationLoadedByNetwork: Duration
+    let predictedDurationToLoad: Duration
     let isPlayable: Bool
     
+    public var bufferingProgress: Double {
+        get {
+            return (startingNeedle + durationLoadedByNetwork) / predictedDurationToLoad
+        }
+    }
+    
     public var startingBufferTimePositon: Double {
         get {
             return startingNeedle
@@ -52,4 +59,8 @@ public struct SAAudioAvailabilityRange {
     public func contains(_ needle: Double) -> Bool {
         return needle >= startingNeedle && (needle - startingNeedle) < durationLoadedByNetwork
     }
+    
+    public func isCompletelyBuffered() -> Bool {
+        return startingNeedle + durationLoadedByNetwork >= predictedDurationToLoad
+    }
 }

SwiftAudioPlayer.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftAudioPlayer'
-  s.version          = '2.6.0'
+  s.version          = '2.8.0'
   s.summary          = 'SwiftAudioPlayer is a Swift based audio player that can handle streaming from a remote location and audio manipulation.'
 
 # This description is used to generate tags and improve search results.