Release 7.0.1

Refractor cache for broadcasting updates

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		A40DBE292391D9CA00F86146 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40DBE282391D9C900F86146 /* Data.swift */; };
 		A411CE4625F9609D0039E1CD /* SAPlayerFeatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = A411CE4525F9609D0039E1CD /* SAPlayerFeatures.swift */; };
 		A41AA0D2238BB9B600A467E1 /* SAPlayingStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.swift */; };
+		A448635026CB783800CFDC29 /* DirectorThreadSafeClosures.swift in Sources */ = {isa = PBXBuildFile; fileRef = A448634F26CB783800CFDC29 /* DirectorThreadSafeClosures.swift */; };
 		A4681FC6220113880018AB51 /* SAPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F8D2200E00E0018AB51 /* SAPlayer.swift */; };
 		A4681FC72201138B0018AB51 /* SAPlayerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F912200E1950018AB51 /* SAPlayerDelegate.swift */; };
 		A4681FC82201138E0018AB51 /* SAPlayerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F8F2200E1450018AB51 /* SAPlayerPresenter.swift */; };
@@ -39,7 +40,7 @@
 		A4681FDC220113D70018AB51 /* AudioDownloadWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681FA22200E6710018AB51 /* AudioDownloadWorker.swift */; };
 		A4681FDD220113DC0018AB51 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F962200E2E20018AB51 /* URL.swift */; };
 		A4681FDE220113DE0018AB51 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F892200DB3C0018AB51 /* Date.swift */; };
-		A4681FDF220113E20018AB51 /* DirectorThreadSafeClosures.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F872200DAD50018AB51 /* DirectorThreadSafeClosures.swift */; };
+		A4681FDF220113E20018AB51 /* DirectorThreadSafeClosuresDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F872200DAD50018AB51 /* DirectorThreadSafeClosuresDeprecated.swift */; };
 		A4681FE0220113E40018AB51 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F802200D0500018AB51 /* Log.swift */; };
 		A4681FE1220113E70018AB51 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4681F8B2200DDD50018AB51 /* Constants.swift */; };
 		A470FE0825F9ADF800F135FF /* AudioClockDirector.swift in Sources */ = {isa = PBXBuildFile; fileRef = A470FE0625F9ADF800F135FF /* AudioClockDirector.swift */; };
@@ -100,10 +101,11 @@
 		A40DBE282391D9C900F86146 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
 		A411CE4525F9609D0039E1CD /* SAPlayerFeatures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayerFeatures.swift; sourceTree = "<group>"; };
 		A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayingStatus.swift; sourceTree = "<group>"; };
+		A448634F26CB783800CFDC29 /* DirectorThreadSafeClosures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectorThreadSafeClosures.swift; sourceTree = "<group>"; };
 		A4523BC8220A0B3C0079C4BC /* Credited_LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = Credited_LICENSE; sourceTree = "<group>"; };
 		A4681F802200D0500018AB51 /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
 		A4681F822200D9150018AB51 /* AudioEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioEngine.swift; sourceTree = "<group>"; };
-		A4681F872200DAD50018AB51 /* DirectorThreadSafeClosures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectorThreadSafeClosures.swift; sourceTree = "<group>"; };
+		A4681F872200DAD50018AB51 /* DirectorThreadSafeClosuresDeprecated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectorThreadSafeClosuresDeprecated.swift; sourceTree = "<group>"; };
 		A4681F892200DB3C0018AB51 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = "<group>"; };
 		A4681F8B2200DDD50018AB51 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		A4681F8D2200E00E0018AB51 /* SAPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayer.swift; sourceTree = "<group>"; };
@@ -264,10 +266,11 @@
 			children = (
 				A4681F8B2200DDD50018AB51 /* Constants.swift */,
 				A4681F802200D0500018AB51 /* Log.swift */,
-				A4681F872200DAD50018AB51 /* DirectorThreadSafeClosures.swift */,
+				A4681F872200DAD50018AB51 /* DirectorThreadSafeClosuresDeprecated.swift */,
 				A4681F892200DB3C0018AB51 /* Date.swift */,
 				A4681F962200E2E20018AB51 /* URL.swift */,
 				A40DBE282391D9C900F86146 /* Data.swift */,
+				A448634F26CB783800CFDC29 /* DirectorThreadSafeClosures.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -516,6 +519,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A448635026CB783800CFDC29 /* DirectorThreadSafeClosures.swift in Sources */,
 				A470FE0925F9ADF800F135FF /* DownloadProgressDirector.swift in Sources */,
 				A41AA0D2238BB9B600A467E1 /* SAPlayingStatus.swift in Sources */,
 				A470FE1C25F9AEB900F135FF /* AudioQueueDirector.swift in Sources */,
@@ -554,7 +558,7 @@
 				A4681FCD2201139E0018AB51 /* AudioStreamEngine.swift in Sources */,
 				A411CE4625F9609D0039E1CD /* SAPlayerFeatures.swift in Sources */,
 				A4681FD9220113CD0018AB51 /* AudioStreamWorker.swift in Sources */,
-				A4681FDF220113E20018AB51 /* DirectorThreadSafeClosures.swift in Sources */,
+				A4681FDF220113E20018AB51 /* DirectorThreadSafeClosuresDeprecated.swift in Sources */,
 				A4681FCB220113980018AB51 /* AudioEngine.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Example/SwiftAudioPlayer/ViewController.swift

@@ -114,27 +114,14 @@ class ViewController: UIViewController {
         selectedAudio.setIndex(i)
         
         if selectedAudio.savedUrl != nil {
+            downloadButton.isEnabled = true
             downloadButton.setTitle("Delete downloaded", for: .normal)
             streamButton.isEnabled = false
         } else {
+            downloadButton.isEnabled = true
             downloadButton.setTitle("Download", for: .normal)
             streamButton.isEnabled = true
         }
-        
-        if let savedUrl = selectedAudio.savedUrl {
-            self.currentUrlLocationLabel.text = "saved url: \(savedUrl.absoluteString)"
-        } else {
-            self.currentUrlLocationLabel.text = "remote url: \(selectedAudio.url.absoluteString)"
-        }
-        
-        //        if let savedUrl = savedUrls[selectedAudio] {}
-        scrubberSlider.value = 0
-        bufferProgress.progress = 0
-        
-//        unsubscribeFromChanges()
-//        subscribeToChanges()
-        
-        SAPlayer.shared.mediaInfo = SALockScreenInfo(title: selectedAudio.title, artist: selectedAudio.artist, albumTitle: nil, artwork: UIImage(), releaseDate: selectedAudio.releaseDate)
     }
     
     func checkIfAudioDownloaded() {
@@ -146,16 +133,14 @@ class ViewController: UIViewController {
     }
     
     func subscribeToChanges() {
-        durationId = SAPlayer.Updates.Duration.subscribe { [weak self] (url, duration) in
+        durationId = SAPlayer.Updates.Duration.subscribe { [weak self] (duration) in
             guard let self = self else { return }
-            guard url == self.selectedAudio.savedUrl || url == self.selectedAudio.url else { return }
             self.durationLabel.text = SAPlayer.prettifyTimestamp(duration)
             self.duration = duration
         }
         
-        elapsedId = SAPlayer.Updates.ElapsedTime.subscribe { [weak self] (url, position) in
+        elapsedId = SAPlayer.Updates.ElapsedTime.subscribe { [weak self] (position) in
             guard let self = self else { return }
-            guard url == self.selectedAudio.savedUrl || url == self.selectedAudio.url else { return }
             
             self.currentTimestampLabel.text = SAPlayer.prettifyTimestamp(position)
             
@@ -177,11 +162,8 @@ class ViewController: UIViewController {
             }
         }
         
-        bufferId = SAPlayer.Updates.StreamingBuffer.subscribe{ [weak self] (url, buffer) in
+        bufferId = SAPlayer.Updates.StreamingBuffer.subscribe{ [weak self] (buffer) in
             guard let self = self else { return }
-            guard url == self.selectedAudio.savedUrl || url == self.selectedAudio.url else { return }
-            
-            if self.duration == 0.0 { return }
             
             self.bufferProgress.progress = Float(buffer.bufferingProgress)
             
@@ -194,9 +176,8 @@ class ViewController: UIViewController {
             self.isPlayable = buffer.isReadyForPlaying
         }
         
-        playingStatusId = SAPlayer.Updates.PlayingStatus.subscribe { [weak self] (url, playing) in
+        playingStatusId = SAPlayer.Updates.PlayingStatus.subscribe { [weak self] (playing) in
             guard let self = self else { return }
-            guard url == self.selectedAudio.savedUrl || url == self.selectedAudio.url else { return }
             
             self.playbackStatus = playing
             
@@ -222,13 +203,14 @@ class ViewController: UIViewController {
             }
         }
         
-        queueId = SAPlayer.Updates.AudioQueue.subscribe { [weak self] key, forthcomingPlaybackUrl in
+        queueId = SAPlayer.Updates.AudioQueue.subscribe { [weak self] forthcomingPlaybackUrl in
             guard let self = self else { return }
             /// we update the selected audio. this is a little contrived, but allows us to update outlets
             if let indexFound = self.selectedAudio.getIndex(forURL: forthcomingPlaybackUrl) {
                 self.selectAudio(atIndex: indexFound)
             }
-            print("💥 Received queue update 💥")
+            
+            self.currentUrlLocationLabel.text = "\(forthcomingPlaybackUrl.absoluteString)"
         }
     }
     
@@ -303,9 +285,6 @@ class ViewController: UIViewController {
                     DispatchQueue.main.async {
                         self.currentUrlLocationLabel.text = "saved to: \(url.lastPathComponent)"
                         self.selectedAudio.addSavedUrl(url)
-                        
-                        SAPlayer.shared.startSavedAudio(withSavedUrl: url, mediaInfo: self.selectedAudio.lockscreenInfo)
-                        self.lastPlayedAudioIndex = self.selectedAudio.index
                     }
                 })
                 streamButton.isEnabled = false
@@ -320,6 +299,7 @@ class ViewController: UIViewController {
     
     @IBAction func streamTouched(_ sender: Any) {
         if !isStreaming {
+            self.currentUrlLocationLabel.text = "remote url: \(selectedAudio.url.absoluteString)"
             if selectedAudio.index == 2 { // radio
                 SAPlayer.shared.startRemoteAudio(withRemoteUrl: selectedAudio.url, bitrate: .low, mediaInfo: selectedAudio.lockscreenInfo)
             } else {

README.md

@@ -78,13 +78,10 @@ To receive streaming progress (for buffer progress %):
 override func viewDidLoad() {
     super.viewDidLoad()
     
-    _ = SAPlayer.Updates.StreamingBuffer.subscribe{ [weak self] (url, buffer) in
+    _ = SAPlayer.Updates.StreamingBuffer.subscribe{ [weak self] buffer in
         guard let self = self else { return }
-        guard url == self.selectedAudioUrl else { return }
 
-        let progress = Float((buffer.totalDurationBuffered + buffer.startingBufferTimePositon) / self.duration)
-
-        self.bufferProgress.progress = progress
+        self.bufferProgress.progress = Float(buffer.bufferingProgress)
 
         self.isPlayable = buffer.isReadyForPlaying
     }
@@ -168,6 +165,8 @@ SAPlayer.shared.queueSavedAudio(withSavedUrl: C://random_folder/audio.mp3) // or
 SAPlayer.shared.queueRemoteAudio(withRemoteUrl: https://randomwebsite.com/audio.mp3)
 ```
 
+You can also directly access and modify the queue from `SAPlayer.shared.audioQueued`.
+
 #### Important
 
 The engine can handle audio manipulations like speed, pitch, effects, etc. To do this, nodes for effects must be finalized before initialize is called. Look at [audio manipulation documentation](#realtime-audio-manipulation) for more information.
@@ -257,14 +256,16 @@ Receive updates for changing values from the player, such as the duration, elaps
 
 All subscription functions for updates take the form of:
 ```swift
-func subscribe(_ closure: @escaping (_ url: URL, _ payload:  <Payload>) -> ()) -> UInt
+func subscribe(_ closure: @escaping (_ payload:  <Payload>) -> ()) -> UInt
 ```
 
 - `closure`: The closure that will receive the updates. It's recommended to have a weak reference to a class that uses these functions.
-- `url`: The corresponding remote URL for the update. In the case there might be multiple files observed, such as downloading many files at once or switching over from playing one audio to another and the updates corresponding to the previous aren't silenced on switch-over.
 - `payload`: The updated value.
 - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
 
+Sometimes there is:
+- `url`: The corresponding remote URL for the update. In the case there might be multiple files observed, such as downloading many files at once.
+
 Similarily unsubscribe takes the form of: 
 ```swift
 func unsubscribe(_ id: UInt)
@@ -302,6 +303,11 @@ Payload = `Double`
 
 Changes in the progress of downloading audio in the background. This does not correspond to progress in streaming downloads, look at StreamingBuffer for streaming progress.
 
+### AudioQueue
+Payload = `URL`
+
+Notification of the URL of the upcoming audio to be played. This URL may be remote or locally saved.
+
 ## Audio Effects
 
 ### Realtime Audio Manipulation

Source/Directors/AudioClockDirector.swift

@@ -28,6 +28,12 @@ import CoreMedia
 
 class AudioClockDirector {
     static let shared = AudioClockDirector()
+    private var currentAudioKey: Key?
+    
+    private var depNeedleClosures: DirectorThreadSafeClosuresDeprecated<Needle> = DirectorThreadSafeClosuresDeprecated()
+    private var depDurationClosures: DirectorThreadSafeClosuresDeprecated<Duration> = DirectorThreadSafeClosuresDeprecated()
+    private var depPlayingStatusClosures: DirectorThreadSafeClosuresDeprecated<SAPlayingStatus> = DirectorThreadSafeClosuresDeprecated()
+    private var depBufferClosures: DirectorThreadSafeClosuresDeprecated<SAAudioAvailabilityRange> = DirectorThreadSafeClosuresDeprecated()
     
     private var needleClosures: DirectorThreadSafeClosures<Needle> = DirectorThreadSafeClosures()
     private var durationClosures: DirectorThreadSafeClosures<Duration> = DirectorThreadSafeClosures()
@@ -36,9 +42,23 @@ class AudioClockDirector {
     
     private init() {}
     
-    func create() {}
+    func setKey(_ key: Key) {
+        currentAudioKey = key
+    }
+    
+    func resetCache() {
+        needleClosures.resetCache()
+        durationClosures.resetCache()
+        playingStatusClosures.resetCache()
+        bufferClosures.resetCache()
+    }
     
     func clear() {
+        depNeedleClosures.clear()
+        depDurationClosures.clear()
+        depPlayingStatusClosures.clear()
+        depBufferClosures.clear()
+        
         needleClosures.clear()
         durationClosures.clear()
         playingStatusClosures.clear()
@@ -48,43 +68,67 @@ class AudioClockDirector {
     // MARK: - Attaches
     
     // Needle
+    @available(*, deprecated, message: "Use subscribe without key in the closure for current audio updates")
     func attachToChangesInNeedle(closure: @escaping (Key, Needle) throws -> Void) -> UInt {
+        return depNeedleClosures.attach(closure: closure)
+    }
+    
+    func attachToChangesInNeedle(closure: @escaping (Needle) throws -> Void) -> UInt {
         return needleClosures.attach(closure: closure)
     }
     
     
     // Duration
+    @available(*, deprecated, message: "Use subscribe without key in the closure for current audio updates")
     func attachToChangesInDuration(closure: @escaping (Key, Duration) throws -> Void) -> UInt {
+        return depDurationClosures.attach(closure: closure)
+    }
+    
+    func attachToChangesInDuration(closure: @escaping (Duration) throws -> Void) -> UInt {
         return durationClosures.attach(closure: closure)
     }
     
     
     // Playing status
+    @available(*, deprecated, message: "Use subscribe without key in the closure for current audio updates")
     func attachToChangesInPlayingStatus(closure: @escaping (Key, SAPlayingStatus) throws -> Void) -> UInt{
+        return depPlayingStatusClosures.attach(closure: closure)
+    }
+    
+    func attachToChangesInPlayingStatus(closure: @escaping (SAPlayingStatus) throws -> Void) -> UInt{
         return playingStatusClosures.attach(closure: closure)
     }
     
     
     // Buffer
+    @available(*, deprecated, message: "Use subscribe without key in the closure for current audio updates")
     func attachToChangesInBufferedRange(closure: @escaping (Key, SAAudioAvailabilityRange) throws -> Void) -> UInt{
+        return depBufferClosures.attach(closure: closure)
+    }
+    
+    func attachToChangesInBufferedRange(closure: @escaping (SAAudioAvailabilityRange) throws -> Void) -> UInt{
         return bufferClosures.attach(closure: closure)
     }
     
     
     // MARK: - Detaches
     func detachFromChangesInNeedle(withID id: UInt) {
+        depNeedleClosures.detach(id: id)
         needleClosures.detach(id: id)
     }
     
     func detachFromChangesInDuration(withID id: UInt) {
+        depDurationClosures.detach(id: id)
         durationClosures.detach(id: id)
     }
     
     func detachFromChangesInPlayingStatus(withID id: UInt) {
+        depPlayingStatusClosures.detach(id: id)
         playingStatusClosures.detach(id: id)
     }
     
     func detachFromChangesInBufferedRange(withID id: UInt) {
+        depBufferClosures.detach(id: id)
         bufferClosures.detach(id: id)
     }
 }
@@ -92,24 +136,44 @@ class AudioClockDirector {
 // MARK: - Receives notifications from AudioEngine on ticks
 extension AudioClockDirector {
     func needleTick(_ key: Key, needle: Needle) {
-        needleClosures.broadcast(key: key, payload: needle)
+        guard key == currentAudioKey else {
+            Log.debug("silence old updates")
+            return
+        }
+        depNeedleClosures.broadcast(key: key, payload: needle)
+        needleClosures.broadcast(payload: needle)
     }
 }
 
 extension AudioClockDirector {
     func durationWasChanged(_ key: Key, duration: Duration) {
-        durationClosures.broadcast(key: key, payload: duration)
+        guard key == currentAudioKey else {
+            Log.debug("silence old updates")
+            return
+        }
+        depDurationClosures.broadcast(key: key, payload: duration)
+        durationClosures.broadcast(payload: duration)
     }
 }
 
 extension AudioClockDirector {
     func audioPlayingStatusWasChanged(_ key: Key, status: SAPlayingStatus) {
-        playingStatusClosures.broadcast(key: key, payload: status)
+        guard key == currentAudioKey else {
+            Log.debug("silence old updates")
+            return
+        }
+        depPlayingStatusClosures.broadcast(key: key, payload: status)
+        playingStatusClosures.broadcast(payload: status)
     }
 }
 
 extension AudioClockDirector {
     func changeInAudioBuffered(_ key: Key, buffered: SAAudioAvailabilityRange) {
-        bufferClosures.broadcast(key: key, payload: buffered)
+        guard key == currentAudioKey else {
+            Log.debug("silence old updates")
+            return
+        }
+        depBufferClosures.broadcast(key: key, payload: buffered)
+        bufferClosures.broadcast(payload: buffered)
     }
 }

Source/Directors/AudioQueueDirector.swift

@@ -18,7 +18,7 @@ class AudioQueueDirector {
         closures.clear()
     }
 
-    func attach(closure: @escaping (Key, URL) throws -> Void) -> UInt {
+    func attach(closure: @escaping (URL) throws -> Void) -> UInt {
         return closures.attach(closure: closure)
     }
 
@@ -26,7 +26,7 @@ class AudioQueueDirector {
         closures.detach(id: id)
     }
     
-    func changeInQueue(_ key: Key, url: URL) {
-        closures.broadcast(key: key, payload: url)
+    func changeInQueue(url: URL) {
+        closures.broadcast(payload: url)
     }
 }

Source/Directors/DownloadProgressDirector.swift

@@ -28,7 +28,7 @@ import Foundation
 class DownloadProgressDirector {
     static let shared = DownloadProgressDirector()
     
-    var closures: DirectorThreadSafeClosures<Double> = DirectorThreadSafeClosures()
+    var closures: DirectorThreadSafeClosuresDeprecated<Double> = DirectorThreadSafeClosuresDeprecated()
     
     private init() {
         AudioDataManager.shared.attach { [weak self] (key, progress) in

Source/Directors/StreamingDownloadDirector.swift

@@ -26,18 +26,25 @@ import Foundation
 
 class StreamingDownloadDirector {
     static let shared = StreamingDownloadDirector()
+    private var currentAudioKey: Key?
     
     var closures: DirectorThreadSafeClosures<Double> = DirectorThreadSafeClosures()
     
     private init() {}
     
-    func create() {}
+    func setKey(_ key: Key) {
+        currentAudioKey = key
+    }
+    
+    func resetCache() {
+        closures.resetCache()
+    }
     
     func clear() {
         closures.clear()
     }
     
-    func attach(closure: @escaping (Key, Double) throws -> Void) -> UInt {
+    func attach(closure: @escaping (Double) throws -> Void) -> UInt {
         return closures.attach(closure: closure)
     }
     
@@ -48,6 +55,11 @@ class StreamingDownloadDirector {
 
 extension StreamingDownloadDirector {
     func didUpdate(_ key: Key, networkStreamProgress: Double) {
-        closures.broadcast(key: key, payload: networkStreamProgress)
+        guard key == currentAudioKey else {
+            Log.debug("silence old updates")
+            return
+        }
+        
+        closures.broadcast(payload: networkStreamProgress)
     }
 }

Source/Engine/AudioStreamEngine.swift

@@ -157,9 +157,11 @@ class AudioStreamEngine: AudioEngine {
             delegate?.didError()
         }
         
-        streamChangeListenerId = StreamingDownloadDirector.shared.attach { [weak self] (key, progress) in
+        StreamingDownloadDirector.shared.setKey(key)
+        StreamingDownloadDirector.shared.resetCache()
+        
+        streamChangeListenerId = StreamingDownloadDirector.shared.attach { [weak self] (progress) in
             guard let self = self else { return }
-            guard key == url.key else { return }
 
             // polling for buffers when we receive data. This won't be throttled on fresh new audio or seeked audio but in all other cases it most likely will be throttled
             self.pollForNextBuffer() //  no buffer updates because thread issues if I try to update buffer status in streaming listener

Source/Engine/Parser/AudioParser.swift

@@ -155,9 +155,8 @@ class AudioParser: AudioParsable {
         
         self.throttler = AudioThrottler(withRemoteUrl: url, withDelegate: self)
         
-        streamChangeListenerId = StreamingDownloadDirector.shared.attach { [weak self] (key, progress) in
+        streamChangeListenerId = StreamingDownloadDirector.shared.attach { [weak self] (progress) in
             guard let self = self else { return }
-            guard key == url.key else { return }
             self.networkProgress = progress
             
             // initially parse a bunch of packets

Source/SAPlayerPresenter.swift

@@ -39,15 +39,50 @@ class SAPlayerPresenter {
     
     private var urlKeyMap: [Key: URL] = [:]
     
-    var durationRef:UInt = 0
-    var needleRef:UInt = 0
-    var playingStatusRef:UInt = 0
+    var durationRef: UInt = 0
+    var needleRef: UInt = 0
+    var playingStatusRef: UInt = 0
     var audioQueue: [SAAudioQueueItem] = []
     
     init(delegate: SAPlayerDelegate?) {
         self.delegate = delegate
         
         delegate?.setLockScreenControls(presenter: self)
+        
+        durationRef = AudioClockDirector.shared.attachToChangesInDuration(closure: { [weak self] (duration) in
+            guard let self = self else { throw DirectorError.closureIsDead }
+            
+            self.delegate?.updateLockscreenPlaybackDuration(duration: duration)
+            self.duration = duration
+            
+            self.delegate?.setLockScreenInfo(withMediaInfo: self.delegate?.mediaInfo, duration: duration)
+        })
+        
+        needleRef = AudioClockDirector.shared.attachToChangesInNeedle(closure: { [weak self] (needle) in
+            guard let self = self else { throw DirectorError.closureIsDead }
+            
+            self.needle = needle
+            self.delegate?.updateLockscreenElapsedTime(needle: needle)
+        })
+        
+        playingStatusRef = AudioClockDirector.shared.attachToChangesInPlayingStatus(closure: { [weak self] (isPlaying) in
+            guard let self = self else { throw DirectorError.closureIsDead }
+            
+            if(isPlaying == .paused && self.shouldPlayImmediately) {
+                self.shouldPlayImmediately = false
+                self.handlePlay()
+            }
+            
+            // solves bug nil == owningEngine || GetEngine() == owningEngine where too many
+            // ended statuses were notified to cause 2 engines to be initialized and causes an error.
+            // TODO don't need guard
+            guard isPlaying != self.isPlaying else { return }
+            self.isPlaying = isPlaying
+            
+            if(self.isPlaying == .ended) {
+                self.playNextAudioIfExists()
+            }
+        })
     }
     
     func getUrl(forKey key: Key) -> URL? {
@@ -60,28 +95,33 @@ class SAPlayerPresenter {
     
     func handleClear() {
         delegate?.clearEngine()
+        AudioClockDirector.shared.resetCache()
         
         needle = nil
         duration = nil
         key = nil
         delegate?.mediaInfo = nil
         delegate?.clearLockScreenInfo()
-        
-        AudioClockDirector.shared.detachFromChangesInDuration(withID: durationRef)
-        AudioClockDirector.shared.detachFromChangesInNeedle(withID: needleRef)
-        AudioClockDirector.shared.detachFromChangesInPlayingStatus(withID: playingStatusRef)
     }
     
     func handlePlaySavedAudio(withSavedUrl url: URL) {
-        attachForUpdates(url: url)
+        resetCacheForNewAudio(url: url)
         delegate?.startAudioDownloaded(withSavedUrl: url)
     }
     
     func handlePlayStreamedAudio(withRemoteUrl url: URL, bitrate: SAPlayerBitrate) {
-        attachForUpdates(url: url)
+        resetCacheForNewAudio(url: url)
         delegate?.startAudioStreamed(withRemoteUrl: url, bitrate: bitrate)
     }
     
+    private func resetCacheForNewAudio(url: URL) {
+        self.key = url.key
+        urlKeyMap[url.key] = url
+        
+        AudioClockDirector.shared.setKey(url.key)
+        AudioClockDirector.shared.resetCache()
+    }
+    
     func handleQueueStreamedAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo?, bitrate: SAPlayerBitrate) {
         audioQueue.append(SAAudioQueueItem(loc: .remote, url: url, mediaInfo: mediaInfo, bitrate: bitrate))
     }
@@ -107,68 +147,9 @@ class SAPlayerPresenter {
         return urls
     }
     
-    private func attachForUpdates(url: URL) {
-        detachFromUpdates()
-        
-        self.key = url.key
-        urlKeyMap[url.key] = url
-        
-        durationRef = AudioClockDirector.shared.attachToChangesInDuration(closure: { [weak self] (key, duration) in
-            guard let self = self else { throw DirectorError.closureIsDead }
-            guard key == self.key else {
-                Log.debug("misfire expected key: \(self.key ?? "none") payload key: \(key)")
-                return
-            }
-            
-            self.delegate?.updateLockscreenPlaybackDuration(duration: duration)
-            self.duration = duration
-            
-            self.delegate?.setLockScreenInfo(withMediaInfo: self.delegate?.mediaInfo, duration: duration)
-        })
-        
-        needleRef = AudioClockDirector.shared.attachToChangesInNeedle(closure: { [weak self] (key, needle) in
-            guard let self = self else { throw DirectorError.closureIsDead }
-            guard key == self.key else {
-                Log.debug("misfire expected key: \(self.key ?? "none") payload key: \(key)")
-                return
-            }
-            
-            self.needle = needle
-            self.delegate?.updateLockscreenElapsedTime(needle: needle)
-        })
-        
-        playingStatusRef = AudioClockDirector.shared.attachToChangesInPlayingStatus(closure: { [weak self] (key, isPlaying) in
-            guard let self = self else { throw DirectorError.closureIsDead }
-            guard key == self.key else {
-                Log.debug("misfire expected key: \(self.key ?? "none") payload key: \(key)")
-                return
-            }
-            
-            if(isPlaying == .paused && self.shouldPlayImmediately) {
-                self.shouldPlayImmediately = false
-                self.handlePlay()
-            }
-            
-            // solves bug nil == owningEngine || GetEngine() == owningEngine where too many
-            // ended statuses were notified to cause 2 engines to be initialized and causes an error.
-            guard isPlaying != self.isPlaying else { return }
-            self.isPlaying = isPlaying
-            
-            if(self.isPlaying == .ended) {
-                self.playNextAudioIfExists()
-            }
-        })
-    }
-    
-    private func detachFromUpdates() {
-        AudioClockDirector.shared.detachFromChangesInDuration(withID: durationRef)
-        AudioClockDirector.shared.detachFromChangesInNeedle(withID: needleRef)
-        AudioClockDirector.shared.detachFromChangesInPlayingStatus(withID: playingStatusRef)
-    }
-    
     func handleStopStreamingAudio() {
         delegate?.clearEngine()
-        detachFromUpdates()
+        AudioClockDirector.shared.resetCache()
     }
 }
 
@@ -239,11 +220,9 @@ extension SAPlayerPresenter {
             return
         }
         let nextAudioURL = audioQueue.removeFirst()
-        let key = nextAudioURL.url.key
-        
 
         Log.info("getting ready to play \(nextAudioURL)")
-        AudioQueueDirector.shared.changeInQueue(key, url: nextAudioURL.url)
+        AudioQueueDirector.shared.changeInQueue(url: nextAudioURL.url)
         
         handleClear()
         

Source/SAPlayerUpdateSubscription.swift

@@ -47,6 +47,7 @@ extension SAPlayer {
              - Parameter timePosition: The current time within the audio that is playing.
              - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
              */
+            @available(*, deprecated, message: "Use subscribe without the url in the closure for current audio updates")
             public static func subscribe(_ closure: @escaping (_ url: URL, _ timePosition:  Double) -> ()) -> UInt {
                 return AudioClockDirector.shared.attachToChangesInNeedle(closure: { (key, needle) in
                     guard let url = SAPlayer.shared.getUrl(forKey: key) else { return }
@@ -54,6 +55,19 @@ extension SAPlayer {
                 })
             }
             
+            /**
+             Subscribe to updates in elapsed time of the playing audio. Aka, the current timestamp of the audio.
+             
+             - Note: It's recommended to have a weak reference to a class that uses this function
+             
+             - Parameter closure: The closure that will receive the updates of the changes in time.
+             - Parameter timePosition: The current time within the audio that is playing.
+             - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
+             */
+            public static func subscribe(_ closure: @escaping (_ timePosition:  Double) -> ()) -> UInt {
+                AudioClockDirector.shared.attachToChangesInNeedle(closure: closure)
+            }
+            
             /**
              Stop recieving updates of changes in elapsed time of audio.
              
@@ -83,6 +97,7 @@ extension SAPlayer {
              - Parameter duration: The duration of the current initialized audio.
              - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
              */
+            @available(*, deprecated, message: "Use subscribe without the url in the closure for current audio updates")
             public static func subscribe(_ closure: @escaping (_ url: URL, _ duration: Double) -> ()) -> UInt {
                 return AudioClockDirector.shared.attachToChangesInDuration(closure: { (key, duration) in
                     guard let url = SAPlayer.shared.getUrl(forKey: key) else { return }
@@ -90,6 +105,21 @@ extension SAPlayer {
                 })
             }
             
+            /**
+             Subscribe to updates to changes in duration of the current audio initialized.
+             
+             - Note: If you are streaming from a source that does not have an expected size at the beginning of a stream, such as live streams, duration will be constantly updating to best known value at the time (which is the seconds buffered currently and not necessarily the actual total duration of audio).
+             
+             - Note: It's recommended to have a weak reference to a class that uses this function
+             
+             - Parameter closure: The closure that will receive the updates of the changes in duration.
+             - Parameter duration: The duration of the current initialized audio.
+             - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
+             */
+            public static func subscribe(_ closure: @escaping (_ duration: Double) -> ()) -> UInt {
+                return AudioClockDirector.shared.attachToChangesInDuration(closure: closure)
+            }
+            
             /**
              Stop recieving updates of changes in duration of the current initialized audio.
              
@@ -115,6 +145,7 @@ extension SAPlayer {
              - Parameter playingStatus: Whether the player is playing audio or paused.
              - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
              */
+            @available(*, deprecated, message: "Use subscribe without the url in the closure for current audio updates")
             public static func subscribe(_ closure: @escaping (_ url: URL, _ playingStatus: SAPlayingStatus) -> ()) -> UInt {
                 return AudioClockDirector.shared.attachToChangesInPlayingStatus(closure: { (key, isPlaying) in
                     guard let url = SAPlayer.shared.getUrl(forKey: key) else { return }
@@ -122,6 +153,19 @@ extension SAPlayer {
                 })
             }
             
+            /**
+             Subscribe to updates to changes in the playing/paused status of audio.
+             
+             - Note: It's recommended to have a weak reference to a class that uses this function
+             
+             - Parameter closure: The closure that will receive the updates of the changes in duration.
+             - Parameter playingStatus: Whether the player is playing audio or paused.
+             - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
+             */
+            public static func subscribe(_ closure: @escaping (_ playingStatus: SAPlayingStatus) -> ()) -> UInt {
+                return AudioClockDirector.shared.attachToChangesInPlayingStatus(closure: closure)
+            }
+            
             /**
              Stop recieving updates of changes in the playing/paused status of audio.
              
@@ -149,6 +193,7 @@ extension SAPlayer {
              - Parameter buffer: Availabity of audio that has been downloaded to play.
              - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
              */
+            @available(*, deprecated, message: "Use subscribe without the url in the closure for current audio updates")
             public static func subscribe(_ closure: @escaping (_ url: URL, _ buffer: SAAudioAvailabilityRange) -> ()) -> UInt {
                 return AudioClockDirector.shared.attachToChangesInBufferedRange(closure: { (key, buffer) in
                     guard let url = SAPlayer.shared.getUrl(forKey: key) else { return }
@@ -156,6 +201,21 @@ extension SAPlayer {
                 })
             }
             
+            /**
+             Subscribe to updates to changes in the progress of downloading audio for streaming. Information about range of audio available and if the audio is playable. Look at SAAudioAvailabilityRange for more information. For progress of downloading audio that saves to the phone for playback later, look at AudioDownloading instead.
+             
+             - Note: For live streams that don't have an expected audio length from the beginning of the stream; the duration is constantly changing and equal to the total seconds buffered from the SAAudioAvailabilityRange.
+             
+             - Note: It's recommended to have a weak reference to a class that uses this function
+             
+             - Parameter closure: The closure that will receive the updates of the changes in duration.
+             - Parameter buffer: Availabity of audio that has been downloaded to play.
+             - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
+             */
+            public static func subscribe(_ closure: @escaping (_ buffer: SAAudioAvailabilityRange) -> ()) -> UInt {
+                return AudioClockDirector.shared.attachToChangesInBufferedRange(closure: closure)
+            }
+            
             /**
              Stop recieving updates of changes in streaming progress.
              
@@ -207,10 +267,8 @@ extension SAPlayer {
              - Parameter url: The corresponding remote URL for the forthcoming audio file.
              - Returns: the id for the subscription in the case you would like to unsubscribe to updates for the closure.
              */
-            public static func subscribe(_ closure: @escaping (_ key: String, _ newUrl: URL) -> ()) -> UInt {
-                return AudioQueueDirector.shared.attach(closure: { (key, url) in
-                    closure(key, url)
-                })
+            public static func subscribe(_ closure: @escaping (_ newUrl: URL) -> ()) -> UInt {
+                return AudioQueueDirector.shared.attach(closure: closure)
             }
 
             /**

Source/Util/DirectorThreadSafeClosures.swift

@@ -25,18 +25,15 @@
 
 import Foundation
 
-enum DirectorError: Error {
-    case closureIsDead
-}
 
 /**
  P for payload
  */
 class DirectorThreadSafeClosures<P>  {
-    typealias TypeClosure = (Key, P) throws -> Void
+    typealias TypeClosure = (P) throws -> Void
     private var queue: DispatchQueue = DispatchQueue(label: "SwiftAudioPlayer.thread_safe_map", attributes: .concurrent)
     private var closures: [UInt: TypeClosure] = [:]
-    private var cache: [Key: P] = [:]
+    private var cache: P? = nil
     
     var count: Int {
         get {
@@ -44,13 +41,17 @@ class DirectorThreadSafeClosures<P>  {
         }
     }
     
-    func broadcast(key: Key, payload: P) {
+    func resetCache() {
+        cache = nil
+    }
+    
+    func broadcast(payload: P) {
         queue.sync {
-            self.cache[key] = payload
+            self.cache = payload
             var iterator = self.closures.makeIterator()
             while let element = iterator.next() {
                 do {
-                    try element.value(key, payload)
+                    try element.value(payload)
                 } catch {
                     helperRemove(withKey: element.key)
                 }
@@ -64,9 +65,9 @@ class DirectorThreadSafeClosures<P>  {
         
         //The director may not yet have the status yet. We should only call the closure if we have it
         //Let the caller know the immediate value. If it's dead already then stop
-        for (key, val) in cache {
+        if let val = cache {
             do {
-                try closure(key, val)
+                try closure(val)
             } catch {
                 return id
             }
@@ -85,7 +86,7 @@ class DirectorThreadSafeClosures<P>  {
     func clear() {
         queue.async(flags: .barrier) {
             self.closures.removeAll()
-            self.cache.removeAll()
+            self.cache = nil
         }
     }
     

Source/Util/DirectorThreadSafeClosuresDeprecated.swift

@@ -0,0 +1,103 @@
+//
+//  DirectorThreadSafeClosures.swift
+//  SwiftAudioPlayer
+//
+//  Created by Tanha Kabir on 2019-01-29.
+//  Copyright © 2019 Tanha Kabir, Jon Mercer
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import Foundation
+
+enum DirectorError: Error {
+    case closureIsDead
+}
+
+/**
+ P for payload
+ */
+class DirectorThreadSafeClosuresDeprecated<P>  {
+    typealias TypeClosure = (Key, P) throws -> Void
+    private var queue: DispatchQueue = DispatchQueue(label: "SwiftAudioPlayer.thread_safe_map", attributes: .concurrent)
+    private var closures: [UInt: TypeClosure] = [:]
+    private var cache: [Key: P] = [:]
+    
+    var count: Int {
+        get {
+            return closures.count
+        }
+    }
+    
+    func broadcast(key: Key, payload: P) {
+        queue.sync {
+            self.cache[key] = payload
+            var iterator = self.closures.makeIterator()
+            while let element = iterator.next() {
+                do {
+                    try element.value(key, payload)
+                } catch {
+                    helperRemove(withKey: element.key)
+                }
+            }
+        }
+    }
+    
+    //UInt is actually 64-bits on modern devices
+    func attach(closure: @escaping TypeClosure) -> UInt {
+        let id: UInt = Date.getUTC64()
+        
+        //The director may not yet have the status yet. We should only call the closure if we have it
+        //Let the caller know the immediate value. If it's dead already then stop
+        for (key, val) in cache {
+            do {
+                try closure(key, val)
+            } catch {
+                return id
+            }
+        }
+        
+        //Replace what's in the map with the new closure
+        helperInsert(withKey: id, closure: closure)
+        
+        return id
+    }
+    
+    func detach(id: UInt) {
+        helperRemove(withKey: id)
+    }
+    
+    func clear() {
+        queue.async(flags: .barrier) {
+            self.closures.removeAll()
+            self.cache.removeAll()
+        }
+    }
+    
+    private func helperRemove(withKey key: UInt) {
+        queue.async(flags: .barrier) {
+            self.closures[key] = nil
+        }
+    }
+    
+    private func helperInsert(withKey key: UInt, closure: @escaping TypeClosure) {
+        queue.async(flags: .barrier) {
+            self.closures[key] = closure
+        }
+    }
+}

SwiftAudioPlayer.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftAudioPlayer'
-  s.version          = '6.3.1'
+  s.version          = '7.0.1'
   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.