Update Readme. Update podspec.

Verision 0.4.4

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SwiftAudio.xcscheme

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0930"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1AB61EB02FDF0033DCB1F8416419F110"
+               BuildableName = "SwiftAudio.framework"
+               BlueprintName = "SwiftAudio"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1AB61EB02FDF0033DCB1F8416419F110"
+            BuildableName = "SwiftAudio.framework"
+            BlueprintName = "SwiftAudio"
+            ReferencedContainer = "container:Pods.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/Tests/QueueManagerTests.swift

@@ -170,6 +170,18 @@ class QueueManagerTests: QuickSpec {
                             expect(manager.current).to(equal(self.dummyItems.first))
                         })
                     })
+                    
+                    context("then removing previous items", {
+                        beforeEach {
+                            manager.removePreviousItems()
+                        }
+                        it("should have no previous items", closure: {
+                            expect(manager.previousItems.count).to(equal(0))
+                        })
+                        it("should have current index zero", closure: {
+                            expect(manager.currentIndex).to(equal(0))
+                        })
+                    })
                 })
                 
                 context("adding more items", {

Example/Tests/QueuedAudioPlayerTests.swift

@@ -98,6 +98,26 @@ class QueuedAudioPlayerTests: QuickSpec {
                             expect(audioPlayer.nextItems.count).to(equal(0))
                         })
                     })
+                    
+                    context("then removing upcoming items", {
+                        beforeEach {
+                            audioPlayer.removeUpcomingItems()
+                        }
+                        
+                        it("should be empty", closure: {
+                            expect(audioPlayer.nextItems.count).to(equal(0))
+                        })
+                    })
+                    
+                    context("then stopping", {
+                        beforeEach {
+                            audioPlayer.stop()
+                        }
+                        
+                        it("should be empty", closure: {
+                            expect(audioPlayer.nextItems.count).to(equal(0))
+                        })
+                    })
                 })
             })
             
@@ -124,6 +144,26 @@ class QueuedAudioPlayerTests: QuickSpec {
                         })
                     })
                     
+                    context("then removing all previous items", {
+                        beforeEach {
+                            audioPlayer.removePreviousItems()
+                        }
+                        
+                        it("should be empty", closure: {
+                            expect(audioPlayer.previousItems.count).to(equal(0))
+                        })
+                    })
+                    
+                    context("then stopping", {
+                        beforeEach {
+                            audioPlayer.stop()
+                        }
+                        
+                        it("should be empty", closure: {
+                            expect(audioPlayer.previousItems.count).to(equal(0))
+                        })
+                    })
+                    
                 })
             })
         }

README.md

@@ -18,13 +18,21 @@ iOS 10.0+
 
 ## Installation
 
+### CocoaPods
 SwiftAudio is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'SwiftAudio', '~> 0.4.0'
+pod 'SwiftAudio', '~> 0.4.4'
 ```
 
+### Carthage
+SwiftAudio supports [Carthage](https://github.com/Carthage/Carthage). Add this to your Cartfile:
+```ruby
+github "jorgenhenrichsen/SwiftAudio" ~> 0.4.4
+```
+Then follow the rest of Carthage instructions on [adding a framework](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application).
+
 ## Usage
 
 ### AudioPlayer

SwiftAudio.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftAudio'
-  s.version          = '0.4.0'
+  s.version          = '0.4.4'
   s.summary          = 'Easy audio streaming for iOS'
 
 # This description is used to generate tags and improve search results.

SwiftAudio/Classes/AVPlayerWrapper/AVPlayerWrapper.swift

@@ -88,7 +88,11 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
         if let seconds = currentItem?.duration.seconds, !seconds.isNaN {
             return seconds
         }
-        return 0
+        else if let seconds = currentItem?.loadedTimeRanges.first?.timeRangeValue.duration.seconds,
+            !seconds.isNaN {
+            return seconds
+        }
+        return 0.0
     }
     
     weak var delegate: AVPlayerWrapperDelegate? = nil
@@ -144,7 +148,7 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
         }
     }
 
-    public func load(from url: URL, playWhenReady: Bool) {
+    func load(from url: URL, playWhenReady: Bool) {
         reset(soft: true)
         _playWhenReady = playWhenReady
         _state = .loading
@@ -165,12 +169,13 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
     // MARK: - Util
     
     private func reset(soft: Bool) {
+        playerItemObserver.stopObservingCurrentItem()
+        playerTimeObserver.unregisterForBoundaryTimeEvents()
+        playerItemNotificationObserver.stopObservingCurrentItem()
+        
         if !soft {
             avPlayer.replaceCurrentItem(with: nil)
         }
-        
-        playerTimeObserver.unregisterForBoundaryTimeEvents()
-        playerItemNotificationObserver.stopObservingCurrentItem()
     }
     
 }

SwiftAudio/Classes/AudioPlayer.swift

@@ -259,7 +259,7 @@ public class AudioPlayer: AVPlayerWrapperDelegate {
     
     // MARK: - Private
     
-    private func reset() {
+    func reset() {
         self._currentItem = nil
     }
     

SwiftAudio/Classes/Observer/AVPlayerItemObserver.swift

@@ -27,6 +27,7 @@ class AVPlayerItemObserver: NSObject {
     
     private struct AVPlayerItemKeyPath {
         static let duration = #keyPath(AVPlayerItem.duration)
+        static let loadedTimeRanges = #keyPath(AVPlayerItem.loadedTimeRanges)
     }
     
     var isObserving: Bool = false
@@ -53,11 +54,13 @@ class AVPlayerItemObserver: NSObject {
             self.isObserving = true
             self.observingItem = item
             item.addObserver(self, forKeyPath: AVPlayerItemKeyPath.duration, options: [.new], context: &AVPlayerItemObserver.context)
+            item.addObserver(self, forKeyPath: AVPlayerItemKeyPath.loadedTimeRanges, options: [.new], context: &AVPlayerItemObserver.context)
         }
     }
     
-    private func stopObservingCurrentItem() {
+    func stopObservingCurrentItem() {
         observingItem?.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.duration, context: &AVPlayerItemObserver.context)
+        observingItem?.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.loadedTimeRanges, context: &AVPlayerItemObserver.context)
         self.isObserving = false
         self.observingItem = nil
     }
@@ -73,8 +76,12 @@ class AVPlayerItemObserver: NSObject {
             if let duration = change?[.newKey] as? CMTime {
                 self.delegate?.item(didUpdateDuration: duration.seconds)
             }
-        default:
-            break
+        
+        case AVPlayerItemKeyPath.loadedTimeRanges:
+            if let ranges = change?[.newKey] as? [NSValue], let duration = ranges.first?.timeRangeValue.duration {
+                self.delegate?.item(didUpdateDuration: duration.seconds)
+            }
+        default: break
             
         }
     }

SwiftAudio/Classes/QueueManager.swift

@@ -203,9 +203,20 @@ class QueueManager<T> {
         
         self._items[_currentIndex] = item
     }
+    
+    /**
+     Remove all previous items in the queue.
+     If no previous items exist, no action will be taken.
+     */
+    public func removePreviousItems() {
+        guard currentIndex > 0 else { return }
+        _items.removeSubrange(0..<_currentIndex)
+        _currentIndex = 0
+    }
 
     /**
      Remove upcoming items.
+     If no upcoming items exist, no action will be taken.
      */
     public func removeUpcomingItems() {
         let nextIndex = _currentIndex + 1

SwiftAudio/Classes/QueuedAudioPlayer.swift

@@ -30,6 +30,9 @@ public class QueuedAudioPlayer: AudioPlayer {
      */
     public override func stop() {
         super.stop()
+    }
+    
+    override func reset() {
         queueManager.clearQueue()
     }
     
@@ -158,6 +161,13 @@ public class QueuedAudioPlayer: AudioPlayer {
         queueManager.removeUpcomingItems()
     }
     
+    /**
+     Remove all previous items, those returned by `previous()`
+     */
+    public func removePreviousItems() {
+        queueManager.removePreviousItems()
+    }
+    
     // MARK: - AVPlayerWrapperDelegate
     
     override func AVWrapper(itemPlaybackDoneWithReason reason: PlaybackEndedReason) {