Update Readme. Update podspec.

Bump version to 0.11.1.
Merge pull request #74 from cbess/patch-1
2019-08-22 22:55:32 +02:00 · 2019-08-22 22:52:36 +02:00 · 2019-08-22 22:39:46 +02:00 · 2019-08-22 21:27:36 +02:00 · 2019-08-12 23:13:36 -05:00 · 2019-07-12 18:13:46 +02:00
20 changed files with 254 additions and 166 deletions
@@ -1 +0,0 @@
-4.2
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
    <device id="retina4_7" orientation="portrait">
        <adaptation id="fullscreen"/>
    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -63,7 +62,7 @@
                                </connections>
                            </button>
                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FCd-3e-22D">
-                                <rect key="frame" x="67" y="84" width="240" height="240"/>
+                                <rect key="frame" x="67.5" y="84" width="240" height="240"/>
                                <constraints>
                                    <constraint firstAttribute="width" constant="240" id="5Sj-BZ-sg4"/>
                                    <constraint firstAttribute="height" constant="240" id="Hij-Yw-6Lg"/>
@@ -105,24 +104,37 @@
                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="1ML-yD-9Rf">
+                                <rect key="frame" x="177.5" y="587" width="20" height="20"/>
+                            </activityIndicatorView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ErrorText" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iCe-6A-2My">
+                                <rect key="frame" x="158.5" y="588.5" width="58.5" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                        </subviews>
                        <color key="backgroundColor" red="0.12984204290000001" green="0.12984612579999999" blue="0.12984395030000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <color key="tintColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="0eh-sL-186"/>
+                            <constraint firstItem="iCe-6A-2My" firstAttribute="centerY" secondItem="1ML-yD-9Rf" secondAttribute="centerY" id="4Fp-kE-AAg"/>
                            <constraint firstItem="l9B-hM-Ajc" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="54L-0h-0ba"/>
                            <constraint firstItem="l9B-hM-Ajc" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" id="9Uh-K9-988"/>
                            <constraint firstItem="RVb-HZ-QCX" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="BhV-UD-qhh"/>
+                            <constraint firstItem="iCe-6A-2My" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="Dhm-Bn-wZH"/>
                            <constraint firstItem="FCd-3e-22D" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="GhI-f1-DkR"/>
                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="HoH-i0-yof"/>
                            <constraint firstItem="RWN-If-dGG" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="Nw7-WM-LFd"/>
                            <constraint firstItem="RX3-VR-CL6" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="O0h-NL-iXW"/>
+                            <constraint firstItem="1ML-yD-9Rf" firstAttribute="top" secondItem="EOo-zV-6l2" secondAttribute="bottom" constant="20" id="Uop-aD-I5b"/>
                            <constraint firstItem="dfk-yr-rwm" firstAttribute="top" secondItem="FCd-3e-22D" secondAttribute="bottom" constant="30" id="W4w-6K-AW8"/>
                            <constraint firstItem="RWN-If-dGG" firstAttribute="top" secondItem="T7Y-1Q-7UU" secondAttribute="bottom" constant="25" id="XgV-XL-QCL"/>
                            <constraint firstItem="dfk-yr-rwm" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="YUE-uf-Rp1"/>
                            <constraint firstItem="RVb-HZ-QCX" firstAttribute="top" secondItem="RWN-If-dGG" secondAttribute="bottom" constant="8" id="ZkD-u2-Zbr"/>
                            <constraint firstItem="T7Y-1Q-7UU" firstAttribute="top" secondItem="dfk-yr-rwm" secondAttribute="bottom" constant="4" id="baR-zV-tgo"/>
                            <constraint firstItem="RWN-If-dGG" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="eNt-u9-qot"/>
+                            <constraint firstItem="1ML-yD-9Rf" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="fdl-RK-Hq8"/>
                            <constraint firstItem="RX3-VR-CL6" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="16" id="hEd-b2-Ggo"/>
                            <constraint firstItem="FCd-3e-22D" firstAttribute="top" secondItem="l9B-hM-Ajc" secondAttribute="bottom" constant="30" id="ikz-ZP-jNM"/>
                            <constraint firstAttribute="trailingMargin" secondItem="RX3-VR-CL6" secondAttribute="trailing" constant="16" id="kSP-Mq-R5P"/>
@@ -135,7 +147,9 @@
                    <connections>
                        <outlet property="artistLabel" destination="T7Y-1Q-7UU" id="b5S-lt-PqG"/>
                        <outlet property="elapsedTimeLabel" destination="3CL-8o-zYW" id="7Wg-7X-Vrd"/>
+                        <outlet property="errorLabel" destination="iCe-6A-2My" id="T4b-0b-wdM"/>
                        <outlet property="imageView" destination="FCd-3e-22D" id="gKL-za-haV"/>
+                        <outlet property="loadIndicator" destination="1ML-yD-9Rf" id="Xes-Ag-vhg"/>
                        <outlet property="playButton" destination="EOo-zV-6l2" id="2d1-ad-s1k"/>
                        <outlet property="remainingTimeLabel" destination="RVb-HZ-QCX" id="8hp-CK-XjF"/>
                        <outlet property="slider" destination="RWN-If-dGG" id="Yxw-Gf-bR3"/>
@@ -21,9 +21,12 @@ class ViewController: UIViewController {
    @IBOutlet weak var elapsedTimeLabel: UILabel!
    @IBOutlet weak var titleLabel: UILabel!
    @IBOutlet weak var artistLabel: UILabel!
+    @IBOutlet weak var loadIndicator: UIActivityIndicatorView!
+    @IBOutlet weak var errorLabel: UILabel!
    
-    var isScrubbing: Bool = false
-    let controller = AudioController.shared
+    private var isScrubbing: Bool = false
+    private let controller = AudioController.shared
+    private var lastLoadFailed: Bool = false
    
    override func viewDidLoad() {
        super.viewDidLoad()
@@ -32,13 +35,23 @@ class ViewController: UIViewController {
        controller.player.event.seek.addListener(self, handleAudioPlayerDidSeek)
        controller.player.event.updateDuration.addListener(self, handleAudioPlayerUpdateDuration)
        controller.player.event.didRecreateAVPlayer.addListener(self, handleAVPlayerRecreated)
+        controller.player.event.fail.addListener(self, handlePlayerFailure)
+        updateMetaData()
+        handleAudioPlayerStateChange(data: controller.player.playerState)
    }
    
    @IBAction func togglePlay(_ sender: Any) {
-        if (!controller.audioSessionController.audioSessionIsActive) {
+        if !controller.audioSessionController.audioSessionIsActive {
            try? controller.audioSessionController.activateSession()
        }
-        controller.player.togglePlaying()
+        if lastLoadFailed, let item = controller.player.currentItem {
+            lastLoadFailed = false
+            errorLabel.isHidden = true
+            try? controller.player.load(item: item, playWhenReady: true)
+        }
+        else {
+            controller.player.togglePlaying()
+        }
    }
    
    @IBAction func previous(_ sender: Any) {
@@ -84,16 +97,31 @@ class ViewController: UIViewController {
        playButton.setTitle(state == .playing ? "Pause" : "Play", for: .normal)
    }
    
+    func setErrorMessage(_ message: String) {
+        self.loadIndicator.stopAnimating()
+        errorLabel.isHidden = false
+        errorLabel.text = message
+    }
+    
    // MARK: - AudioPlayer Event Handlers
    
    func handleAudioPlayerStateChange(data: AudioPlayer.StateChangeEventData) {
+        print(data)
        DispatchQueue.main.async {
            self.setPlayButtonState(forAudioPlayerState: data)
            switch data {
-            case .ready:
+            case .loading:
+                self.loadIndicator.startAnimating()
                self.updateMetaData()
                self.updateTimeValues()
-            case .loading, .playing, .paused, .idle:
+            case .buffering:
+                self.loadIndicator.startAnimating()
+            case .ready:
+                self.loadIndicator.stopAnimating()
+                self.updateMetaData()
+                self.updateTimeValues()
+            case .playing, .paused, .idle:
+                self.loadIndicator.stopAnimating()
                self.updateTimeValues()
            }
        }
@@ -121,4 +149,15 @@ class ViewController: UIViewController {
        try? controller.audioSessionController.set(category: .playback)
    }
    
+    func handlePlayerFailure(data: AudioPlayer.FailEventData) {
+        if let error = data as NSError? {
+            if error.code == -1009 {
+                lastLoadFailed = true
+                DispatchQueue.main.async {
+                    self.setErrorMessage("Network disconnected. Please try again...")
+                }
+            }
+        }
+    }
+    
 }
@@ -30,7 +30,12 @@ class AVPlayerWrapperTests: XCTestCase {
        XCTAssert(wrapper.state == AVPlayerWrapperState.idle)
    }
    
-    func test_AVPlayerWrapper__state__when_loading_a_source__should_be_ready() {
+    func test_AVPlayerWrapper__state__when_loading_a_source__should_be_loading() {
+        wrapper.load(from: Source.url, playWhenReady: false)
+        XCTAssertEqual(wrapper.state, AVPlayerWrapperState.loading)
+    }
+    
+    func test_AVPlayerWrapper__state__when_loading_a_source__should_eventually_be_ready() {
        let expectation = XCTestExpectation()
        holder.stateUpdate = { state in
            if state == .ready {
@@ -29,6 +29,11 @@ class AudioPlayerTests: XCTestCase {
        XCTAssert(audioPlayer.playerState == AudioPlayerState.idle)
    }
    
+    func test_AudioPlayer__state__load_source__should_be_loading() {
+        try? audioPlayer.load(item: Source.getAudioItem(), playWhenReady: false)
+        XCTAssertEqual(audioPlayer.playerState, AudioPlayerState.loading)
+    }
+    
    func test_AudioPlayer__state__load_source__should_be_ready() {
        let expectation = XCTestExpectation()
        listener.stateUpdate = { state in
@@ -68,9 +73,9 @@ class AudioPlayerTests: XCTestCase {
    
    func test_AudioPlayer__state__pausing_source__should_be_paused() {
        let expectation = XCTestExpectation()
-        listener.stateUpdate = { state in
+        listener.stateUpdate = { [weak audioPlayer] state in
            switch state {
-            case .playing: self.audioPlayer.pause()
+            case .playing: audioPlayer?.pause()
            case .paused: expectation.fulfill()
            default: break
            }
@@ -82,11 +87,11 @@ class AudioPlayerTests: XCTestCase {
    func test_AudioPlayer__state__stopping_source__should_be_idle() {
        let expectation = XCTestExpectation()
        var hasBeenPlaying: Bool = false
-        listener.stateUpdate = { state in
+        listener.stateUpdate = { [weak audioPlayer] state in
            switch state {
            case .playing:
                hasBeenPlaying = true
-                self.audioPlayer.stop()
+                audioPlayer?.stop()
            case .idle:
                if hasBeenPlaying {
                    expectation.fulfill()
@@ -117,22 +122,6 @@ class AudioPlayerTests: XCTestCase {
 //        wait(for: [expectation], timeout: 20.0)
 //    }
    
-    func test_AudioPlayer__currentTime__when_loading_source_with_intial_time__should_be_equal_to_initial_time() {
-        let expectation = XCTestExpectation()
-        let item = DefaultAudioItemInitialTime(audioUrl: LongSource.path, artist: nil, title: nil, albumTitle: nil, sourceType: .file, artwork: nil, initialTime: 4.0)
-        listener.stateUpdate = { state in
-            switch state {
-            case .ready:
-                if self.audioPlayer.currentTime == item.getInitialTime() {
-                    expectation.fulfill()
-                }
-            default: break
-            }
-        }
-        try? audioPlayer.load(item: item, playWhenReady: false)
-        wait(for: [expectation], timeout: 20.0)
-    }
-    
    // MARK: - Rate
    
    func test_AudioPlayer__rate__should_be_0() {
@@ -141,10 +130,11 @@ class AudioPlayerTests: XCTestCase {
    
    func test_AudioPlayer__rate__playing_source__should_be_1() {
        let expectation = XCTestExpectation()
-        listener.stateUpdate = { state in
+        listener.stateUpdate = { [weak audioPlayer] state in
+            guard let audioPlayer = audioPlayer else { return }
            switch state {
            case .playing:
-                if self.audioPlayer.rate == 1.0 {
+                if audioPlayer.rate == 1.0 {
                    expectation.fulfill()
                }
            default: break
@@ -162,10 +152,11 @@ class AudioPlayerTests: XCTestCase {
    
    func test_AudioPlayer__currentItem__loading_source__should_not_be_nil() {
        let expectation = XCTestExpectation()
-        listener.stateUpdate = { state in
+        listener.stateUpdate = { [weak audioPlayer] state in
+            guard let audioPlayer = audioPlayer else { return }
            switch state {
            case .ready:
-                if self.audioPlayer.currentItem != nil {
+                if audioPlayer.currentItem != nil {
                    expectation.fulfill()
                }
            default: break
@@ -191,12 +182,20 @@ class AudioPlayerEventListener {
    var secondsElapse: ((_ seconds: TimeInterval) -> Void)?
    var seekCompletion: (() -> Void)?
    
+    weak var audioPlayer: AudioPlayer?
+    
    init(audioPlayer: AudioPlayer) {
        audioPlayer.event.stateChange.addListener(self, handleDidUpdateState)
        audioPlayer.event.seek.addListener(self, handleSeek)
        audioPlayer.event.secondElapse.addListener(self, handleSecondsElapse)
    }
    
+    deinit {
+        audioPlayer?.event.stateChange.removeListener(self)
+        audioPlayer?.event.seek.removeListener(self)
+        audioPlayer?.event.secondElapse.removeListener(self)
+    }
+    
    func handleDidUpdateState(state: AudioPlayerState) {
        self.state = state
    }
@@ -25,13 +25,13 @@ SwiftAudio is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:

 ```ruby
-pod 'SwiftAudio', '~> 0.9.2'
+pod 'SwiftAudio', '~> 0.11.1'
 ```

 ### Carthage
 SwiftAudio supports [Carthage](https://github.com/Carthage/Carthage). Add this to your Cartfile:
 ```ruby
-github "jorgenhenrichsen/SwiftAudio" ~> 0.9.2
+github "jorgenhenrichsen/SwiftAudio" ~> 0.11.1
 ```
 Then follow the rest of Carthage instructions on [adding a framework](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application).

@@ -63,18 +63,6 @@ class MyCustomViewController: UIViewController {
 }
 ```

-If you want to use the [Combine](https://developer.apple.com/documentation/combine) framework for events, each event in the `AudioPlayer` has an `EventPublisher` that can be subscribed to:
-```swift
-let audioPlayer = AudioPlayer()
-audioPlayer.event.stateChange.publisher.subscribe(subscriber: someSubscriber)
-
-/// Using a Sink
-audioPlayer.event.stateChange.publisher.sink { state in 
-    /// Handle state change here.
-}
-```
-**Important**: This requires iOS version equal to or later than 13.0. If an application needs to support older iOS versions it is recommended to use the regular `Event.addListener(listener:)` method.
-
 #### QueuedAudioPlayer
 The `QueuedAudioPlayer` is a subclass of `AudioPlayer` that maintains a queue of audio tracks.
 ```swift
@@ -150,8 +138,6 @@ The current info can be cleared with:
 ```

 ### Remote Commands
-**First** go to App Settings -> Capabilites -> Background Modes -> Check 'Remote notifications'
-
 To enable remote commands for the player you need to populate the RemoteCommands array for the player:
 ```swift
 audioPlayer.remoteCommands = [
@@ -8,35 +8,18 @@

 Pod::Spec.new do |s|
  s.name             = 'SwiftAudio'
-  s.version          = '0.9.2'
+  s.version          = '0.11.1'
  s.summary          = 'Easy audio streaming for iOS'
-
-# This description is used to generate tags and improve search results.
-#   * Think: What does it do? Why did you write it? What is the focus?
-#   * Try to keep it short, snappy and to the point.
-#   * Write the description between the DESC delimiters below.
-#   * Finally, don't worry about the indent, CocoaPods strips it!
-
  s.description      = <<-DESC
 SwiftAudio is an audio player written in Swift, making it simpler to work with audio playback from streams and files.
 DESC

  s.homepage         = 'https://github.com/jorgenhenrichsen/SwiftAudio'
-  # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
  s.license          = { :type => 'MIT', :file => 'LICENSE' }
  s.author           = { 'Jørgen Henrichsen' => 'jh.henrichs@gmail.com' }
  s.source           = { :git => 'https://github.com/jorgenhenrichsen/SwiftAudio.git', :tag => s.version.to_s }
-  # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'

  s.ios.deployment_target = '10.0'
-
+  s.swift_version = '5.0'
  s.source_files = 'SwiftAudio/Classes/**/*'
-  
-  # s.resource_bundles = {
-  #   'SwiftAudio' => ['SwiftAudio/Assets/*.png']
-  # }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
 end
@@ -10,20 +10,18 @@ import Foundation

 public struct APError {
    
-    public enum LoadError: Error {
+    enum LoadError: Error {
        case invalidSourceUrl(String)
    }
    
-    public enum PlaybackError: Error {
+    enum PlaybackError: Error {
        case noLoadedItem
    }
    
-    public enum QueueError: Error {
+    enum QueueError: Error {
        case noPreviousItem
        case noNextItem
        case invalidIndex(index: Int, message: String)
    }
    
-    public enum EventError: Error {}
-    
 }
@@ -168,7 +168,9 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
        }
    }
    
-    func load(from url: URL, playWhenReady: Bool) {
+    
+    
+    func load(from url: URL, playWhenReady: Bool, options: [String: Any]? = nil) {
        reset(soft: true)
        _playWhenReady = playWhenReady

@@ -176,10 +178,16 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
            recreateAVPlayer()
        }
        
-        // Set item
-        self._pendingAsset = AVURLAsset(url: url)
+        self._pendingAsset = AVURLAsset(url: url, options: options)
+        
        if let pendingAsset = _pendingAsset {
-            pendingAsset.loadValuesAsynchronously(forKeys: [Constants.assetPlayableKey], completionHandler: {
+            self._state = .loading
+            pendingAsset.loadValuesAsynchronously(forKeys: [Constants.assetPlayableKey], completionHandler: { [weak self] in
+                
+                guard let self = self else {
+                    return
+                }
+                
                var error: NSError? = nil
                let status = pendingAsset.statusOfValue(forKey: Constants.assetPlayableKey, error: &error)
                
@@ -201,7 +209,6 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
                        break
                        
                    case .failed:
-                        // print("load asset failed")
                        if isPendingAsset {
                            self.delegate?.AVWrapper(failedWithError: error)
                            self._pendingAsset = nil
@@ -209,7 +216,6 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
                        break
                        
                    case .cancelled:
-                        // print("load asset cancelled")
                        break
                        
                    default:
@@ -220,10 +226,10 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
        }
    }
    
-    func load(from url: URL, playWhenReady: Bool, initialTime: TimeInterval?) {
+    func load(from url: URL, playWhenReady: Bool, initialTime: TimeInterval? = nil, options: [String : Any]? = nil) {
        _initialTime = initialTime
        self.pause()
-        self.load(from: url, playWhenReady: playWhenReady)
+        self.load(from: url, playWhenReady: playWhenReady, options: options)
    }
    
    // MARK: - Util
@@ -233,10 +239,8 @@ class AVPlayerWrapper: AVPlayerWrapperProtocol {
        playerTimeObserver.unregisterForBoundaryTimeEvents()
        playerItemNotificationObserver.stopObservingCurrentItem()
        
-        if self._pendingAsset != nil {
-            self._pendingAsset?.cancelLoading()
-            self._pendingAsset = nil
-        }
+        self._pendingAsset?.cancelLoading()
+        self._pendingAsset = nil
        
        if !soft {
            avPlayer.replaceCurrentItem(with: nil)
@@ -269,7 +273,7 @@ extension AVPlayerWrapper: AVPlayerObserverDelegate {
                self._state = .paused
            }
        case .waitingToPlayAtSpecifiedRate:
-            self._state = .loading
+            self._state = .buffering
        case .playing:
            self._state = .playing
        @unknown default:
@@ -279,17 +283,16 @@ extension AVPlayerWrapper: AVPlayerObserverDelegate {
    
    func player(statusDidChange status: AVPlayer.Status) {
        switch status {
-            
        case .readyToPlay:
-            self._state = .ready
-            
-            if let initialTime = _initialTime {
-                self.seek(to: initialTime)
-            }
-            else if _playWhenReady {
+            if _playWhenReady && (_initialTime ?? 0) == 0 {
                self.play()
            }
-            
+            else {
+                self._state = .ready
+                if let initialTime = _initialTime {
+                    self.seek(to: initialTime)
+                }
+            }
            break
            
        case .failed:
@@ -49,8 +49,8 @@ protocol AVPlayerWrapperProtocol: class {
    
    func seek(to seconds: TimeInterval)
    
-    func load(from url: URL, playWhenReady: Bool)
+    func load(from url: URL, playWhenReady: Bool, options: [String: Any]?)
    
-    func load(from url: URL, playWhenReady: Bool, initialTime: TimeInterval?)
+    func load(from url: URL, playWhenReady: Bool, initialTime: TimeInterval?, options: [String: Any]?)
    
 }
@@ -14,11 +14,14 @@ import Foundation
 */
 public enum AVPlayerWrapperState: String {
    
-    /// The current item is set, and the player is ready to start loading (buffering).
+    /// An asset is being loaded for playback.
+    case loading
+    
+    /// The current item is loaded, and the player is ready to start playing.
    case ready
    
-    /// The current item is loading, getting ready to play.
-    case loading
+    /// The current item is playing, but are currently buffering.
+    case buffering
    
    /// The player is paused.
    case paused
@@ -36,6 +36,11 @@ public protocol InitialTiming {
    func getInitialTime() -> TimeInterval
 }

+/// Make your `AudioItem`-subclass conform to this protocol to set initialization options for the asset. Available keys available at [Apple Developer Documentation](https://developer.apple.com/documentation/avfoundation/avurlasset/initialization_options).
+public protocol AssetOptionsProviding {
+    func getAssetOptions() -> [String: Any]
+}
+
 public class DefaultAudioItem: AudioItem {
    
    public var audioUrl: String
@@ -125,3 +130,24 @@ public class DefaultAudioItemInitialTime: DefaultAudioItem, InitialTiming {
    }
    
 }
+
+/// An AudioItem that also conforms to the `AssetOptionsProviding`-protocol
+public class DefaultAudioItemAssetOptionsProviding: DefaultAudioItem, AssetOptionsProviding {
+    
+    public var options: [String: Any]
+    
+    public override init(audioUrl: String, artist: String?, title: String?, albumTitle: String?, sourceType: SourceType, artwork: UIImage?) {
+        self.options = [:]
+        super.init(audioUrl: audioUrl, artist: artist, title: title, albumTitle: albumTitle, sourceType: sourceType, artwork: artwork)
+    }
+    
+    public init(audioUrl: String, artist: String?, title: String?, albumTitle: String?, sourceType: SourceType, artwork: UIImage?, options: [String: Any]) {
+        self.options = options
+        super.init(audioUrl: audioUrl, artist: artist, title: title, albumTitle: albumTitle, sourceType: sourceType, artwork: artwork)
+    }
+    
+    public func getAssetOptions() -> [String: Any] {
+        return options
+    }
+    
+}
@@ -161,7 +161,8 @@ public class AudioPlayer: AVPlayerWrapperDelegate {
        
        wrapper.load(from: url,
                     playWhenReady: playWhenReady,
-                     initialTime: (item as? InitialTiming)?.getInitialTime())
+                     initialTime: (item as? InitialTiming)?.getInitialTime(),
+                     options:(item as? AssetOptionsProviding)?.getAssetOptions())
        
        self._currentItem = item
        
@@ -305,16 +306,14 @@ public class AudioPlayer: AVPlayerWrapperDelegate {
    
    func AVWrapper(didChangeState state: AVPlayerWrapperState) {
        switch state {
-        case .ready:
+        case .ready, .loading:
            if (automaticallyUpdateNowPlayingInfo) {
                updateNowPlayingPlaybackValues()
            }
-            
            setTimePitchingAlgorithmForCurrentItem()
        case .playing, .paused:
            if (automaticallyUpdateNowPlayingInfo) {
-                updateNowPlayingCurrentTime(currentTime)
-                updateNowPlayingRate(rate)
+                updateNowPlayingPlaybackValues()
            }
        default: break
        }
@@ -6,7 +6,6 @@
 //

 import Foundation
-import Combine

 extension AudioPlayer {
    
@@ -70,7 +69,7 @@ extension AudioPlayer {
    
    class Invoker<EventData> {
        
-        /// Signals false if the listener object is nil. If `false` is signaled, the invoker should not be retained.
+        // Signals false if the listener object is nil
        let invoke: (EventData) -> Bool
        weak var listener: AnyObject?
        
@@ -115,7 +114,7 @@ extension AudioPlayer {
                self.invokersSemaphore.signal()
            }
        }
-
+        
        func emit(data: EventData) {
            eventQueue.async {
                self.invokersSemaphore.wait()
@@ -126,34 +125,6 @@ extension AudioPlayer {
            }
        }
        
-        /**
-         The publisher for this event. Use this for subscription through the Combine framework.
-         */
-        @available(iOS 13.0, *)
-        public lazy var publisher: EventPublisher<EventData> = EventPublisher(event: self)
-    }
-    
-}
-
-@available(iOS 13.0, *)
-extension AudioPlayer {
-    
-    public class EventPublisher<EventData>: Publisher {
-        
-        public typealias Output = EventData
-        public typealias Failure = APError.EventError
-        
-        private weak var event: Event<EventData>?
-        
-        init(event: Event<EventData>) {
-            self.event = event
-        }
-        
-        public func receive<S>(subscriber: S) where S : Subscriber, Failure == S.Failure, Output == S.Input {
-            event?.addListener(self) { (data) in
-                let _ = subscriber.receive(data)
-            }
-        }
    }
    
 }
@@ -22,9 +22,15 @@ class AVPlayerItemNotificationObserver {
    
    private let notificationCenter: NotificationCenter = NotificationCenter.default
    
-    weak var observingItem: AVPlayerItem?
+    private(set) weak var observingItem: AVPlayerItem?
    weak var delegate: AVPlayerItemNotificationObserverDelegate?
    
+    private(set) var isObserving: Bool = false
+    
+    deinit {
+        stopObservingCurrentItem()
+    }
+    
    /**
     Will start observing notifications from an item.
     
@@ -34,6 +40,7 @@ class AVPlayerItemNotificationObserver {
    func startObserving(item: AVPlayerItem) {
        stopObservingCurrentItem()
        observingItem = item
+        isObserving = true
        notificationCenter.addObserver(self, selector: #selector(itemDidPlayToEndTime), name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: item)
    }
    
@@ -41,10 +48,12 @@ class AVPlayerItemNotificationObserver {
     Stop receiving notifications for the current item.
     */
    func stopObservingCurrentItem() {
-        if let observingItem = observingItem {
-            notificationCenter.removeObserver(self, name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: observingItem)
+        guard let observingItem = observingItem, isObserving else {
+            return
        }
-        observingItem = nil
+        self.notificationCenter.removeObserver(self, name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: observingItem)
+        self.observingItem = nil
+        self.isObserving = false
    }
    
    @objc private func itemDidPlayToEndTime() {
@@ -30,37 +30,34 @@ class AVPlayerItemObserver: NSObject {
        static let loadedTimeRanges = #keyPath(AVPlayerItem.loadedTimeRanges)
    }
    
-    var isObserving: Bool = false
+    private(set) var isObserving: Bool = false
    
-    weak var observingItem: AVPlayerItem?
+    private(set) weak var observingItem: AVPlayerItem?
    weak var delegate: AVPlayerItemObserverDelegate?
    
    deinit {
-        if self.isObserving {
-            stopObservingCurrentItem()
-        }
+        stopObservingCurrentItem()
    }
    
    /**
-     Start observing an item. Will remove self as observer from old item.
+     Start observing an item. Will remove self as observer from old item, if any.
     
     - parameter item: The player item to observe.
     */
    func startObserving(item: AVPlayerItem) {
-        main.async {
-            if self.isObserving {
-                self.stopObservingCurrentItem()
-            }
-            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)
-        }
+        self.stopObservingCurrentItem()
+        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)
    }
    
    func stopObservingCurrentItem() {
-        observingItem?.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.duration, context: &AVPlayerItemObserver.context)
-        observingItem?.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.loadedTimeRanges, context: &AVPlayerItemObserver.context)
+        guard let observingItem = observingItem, isObserving else {
+            return
+        }
+        observingItem.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.duration, context: &AVPlayerItemObserver.context)
+        observingItem.removeObserver(self, forKeyPath: AVPlayerItemKeyPath.loadedTimeRanges, context: &AVPlayerItemObserver.context)
        self.isObserving = false
        self.observingItem = nil
    }
@@ -36,10 +36,9 @@ class AVPlayerObserver: NSObject {
        static let timeControlStatus = #keyPath(AVPlayer.timeControlStatus)
    }
    
-
    private let statusChangeOptions: NSKeyValueObservingOptions = [.new, .initial]
    private let timeControlStatusChangeOptions: NSKeyValueObservingOptions = [.new]
-    var isObserving: Bool = false
+    private(set) var isObserving: Bool = false
    
    weak var delegate: AVPlayerObserverDelegate?
    weak var player: AVPlayer? {
@@ -66,13 +65,12 @@ class AVPlayerObserver: NSObject {
    }
    
    func stopObserving() {
-        guard let player = player, self.isObserving else {
+        guard let player = player, isObserving else {
            return
        }
        player.removeObserver(self, forKeyPath: AVPlayerKeyPath.status, context: &AVPlayerObserver.context)
        player.removeObserver(self, forKeyPath: AVPlayerKeyPath.timeControlStatus, context: &AVPlayerObserver.context)
        self.isObserving = false
-        
    }
    
    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
@@ -107,7 +105,6 @@ class AVPlayerObserver: NSObject {
    }
    
    private func handleTimeControlStatusChange(_ change: [NSKeyValueChangeKey: Any]?) {
-        
        let status: AVPlayer.TimeControlStatus
        if let statusNumber = change?[.newKey] as? NSNumber {
            status = AVPlayer.TimeControlStatus(rawValue: statusNumber.intValue)!
@@ -10,10 +10,8 @@ import Foundation
 import AVFoundation

 protocol AVPlayerTimeObserverDelegate: class {
-    
    func audioDidStart()
    func timeEvent(time: CMTime)
-    
 }

 /**
@@ -50,6 +48,11 @@ class AVPlayerTimeObserver {
        self.periodicObserverTimeInterval = periodicObserverTimeInterval
    }
    
+    deinit {
+        unregisterForPeriodicEvents()
+        unregisterForBoundaryTimeEvents()
+    }
+    
    /**
     Will register for the AVPlayer BoundaryTimeEvents, to trigger start and complete events.
     */
@@ -79,6 +79,30 @@ public struct SkipIntervalCommand: RemoteCommandProtocol {
    
 }

+public struct FeedbackCommand: RemoteCommandProtocol {
+    
+    public static let like = FeedbackCommand(id: "Like", commandKeyPath: \MPRemoteCommandCenter.likeCommand, handlerKeyPath: \RemoteCommandController.handleLikeCommand)
+    
+    public static let dislike = FeedbackCommand(id: "Dislike", commandKeyPath: \MPRemoteCommandCenter.dislikeCommand, handlerKeyPath: \RemoteCommandController.handleDislikeCommand)
+    
+    public static let bookmark = FeedbackCommand(id: "Bookmark", commandKeyPath: \MPRemoteCommandCenter.bookmarkCommand, handlerKeyPath: \RemoteCommandController.handleBookmarkCommand)
+    
+    public typealias Command = MPFeedbackCommand
+    
+    public let id: String
+    
+    public var commandKeyPath: KeyPath<MPRemoteCommandCenter, MPFeedbackCommand>
+    
+    public var handlerKeyPath: KeyPath<RemoteCommandController, RemoteCommandHandler>
+    
+    func set(isActive: Bool, localizedTitle: String, localizedShortTitle: String) -> FeedbackCommand {
+        MPRemoteCommandCenter.shared()[keyPath: commandKeyPath].isActive = isActive
+        MPRemoteCommandCenter.shared()[keyPath: commandKeyPath].localizedTitle = localizedTitle
+        MPRemoteCommandCenter.shared()[keyPath: commandKeyPath].localizedShortTitle = localizedShortTitle
+        return self
+    }
+}
+
 public enum RemoteCommand {

    case play
@@ -99,6 +123,12 @@ public enum RemoteCommand {
    
    case skipBackward(preferredIntervals: [NSNumber])
    
+    case like(isActive: Bool, localizedTitle: String, localizedShortTitle: String)
+    
+    case dislike(isActive: Bool, localizedTitle: String, localizedShortTitle: String)
+    
+    case bookmark(isActive: Bool, localizedTitle: String, localizedShortTitle: String)
+    
    /**
     All values in an array for convenience.
     Don't use for associated values.
@@ -114,6 +144,9 @@ public enum RemoteCommand {
            .changePlaybackPosition,
            .skipForward(preferredIntervals: []),
            .skipBackward(preferredIntervals: []),
+            .like(isActive: false, localizedTitle: "", localizedShortTitle: ""),
+            .dislike(isActive: false, localizedTitle: "", localizedShortTitle: ""),
+            .bookmark(isActive: false, localizedTitle: "", localizedShortTitle: "")
        ]
    }
    
@@ -64,6 +64,12 @@ public class RemoteCommandController {
        case .changePlaybackPosition: self.enableCommand(ChangePlaybackPositionCommand.changePlaybackPosition)
        case .skipForward(let preferredIntervals): self.enableCommand(SkipIntervalCommand.skipForward.set(preferredIntervals: preferredIntervals))
        case .skipBackward(let preferredIntervals): self.enableCommand(SkipIntervalCommand.skipBackward.set(preferredIntervals: preferredIntervals))
+        case .like(let isActive, let localizedTitle, let localizedShortTitle):
+            self.enableCommand(FeedbackCommand.like.set(isActive: isActive, localizedTitle: localizedTitle, localizedShortTitle: localizedShortTitle))
+        case .dislike(let isActive, let localizedTitle, let localizedShortTitle):
+            self.enableCommand(FeedbackCommand.dislike.set(isActive: isActive, localizedTitle: localizedTitle, localizedShortTitle: localizedShortTitle))
+        case .bookmark(let isActive, let localizedTitle, let localizedShortTitle):
+            self.enableCommand(FeedbackCommand.bookmark.set(isActive: isActive, localizedTitle: localizedTitle, localizedShortTitle: localizedShortTitle))
        }
    }
    
@@ -78,6 +84,9 @@ public class RemoteCommandController {
        case .changePlaybackPosition: self.disableCommand(ChangePlaybackPositionCommand.changePlaybackPosition)
        case .skipForward(_): self.disableCommand(SkipIntervalCommand.skipForward)
        case .skipBackward(_): self.disableCommand(SkipIntervalCommand.skipBackward)
+        case .like(_, _, _): self.disableCommand(FeedbackCommand.like)
+        case .dislike(_, _, _): self.disableCommand(FeedbackCommand.dislike)
+        case .bookmark(_, _, _): self.disableCommand(FeedbackCommand.bookmark)
        }
    }
    
@@ -92,6 +101,9 @@ public class RemoteCommandController {
    public lazy var handleChangePlaybackPositionCommand: RemoteCommandHandler  = self.handleChangePlaybackPositionCommandDefault
    public lazy var handleNextTrackCommand: RemoteCommandHandler = self.handleNextTrackCommandDefault
    public lazy var handlePreviousTrackCommand: RemoteCommandHandler = self.handlePreviousTrackCommandDefault
+    public lazy var handleLikeCommand: RemoteCommandHandler = self.handleLikeCommandDefault
+    public lazy var handleDislikeCommand: RemoteCommandHandler = self.handleDislikeCommandDefault
+    public lazy var handleBookmarkCommand: RemoteCommandHandler = self.handleBookmarkCommandDefault
    
    private func handlePlayCommandDefault(event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
        if let audioPlayer = self.audioPlayer {
@@ -180,6 +192,18 @@ public class RemoteCommandController {
        return MPRemoteCommandHandlerStatus.commandFailed
    }
    
+    private func handleLikeCommandDefault(event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
+        return MPRemoteCommandHandlerStatus.success
+    }
+    
+    private func handleDislikeCommandDefault(event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
+        return MPRemoteCommandHandlerStatus.success
+    }
+    
+    private func handleBookmarkCommandDefault(event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
+        return MPRemoteCommandHandlerStatus.success
+    }
+    
    private func getRemoteCommandHandlerStatus(forError error: Error) -> MPRemoteCommandHandlerStatus {
        if let error = error as? APError.LoadError {
            switch error {
Author	SHA1	Message	Date
Jørgen Henrichsen	e888c7954a	Update Readme. Update podspec. Bump version to 0.11.1.	2019-08-22 22:55:32 +02:00
Jørgen Henrichsen	eea9aee4ec	Merge pull request #74 from cbess/patch-1 Seek to initial time	2019-08-22 22:52:36 +02:00
Jørgen Henrichsen	f2c95fa48c	Merge branch 'master' into patch-1	2019-08-22 22:39:46 +02:00
Jørgen Henrichsen	5c8ac4da6b	Update README Remove incorrect recommendation to enable Remote Notifications.	2019-08-22 21:27:36 +02:00
C. Bess	5369d4f4e8	Seek to initial time Use initial time operation, even for play when ready	2019-08-12 23:13:36 -05:00
Jørgen Henrichsen	09a7548f3a	Update README. Update podspec. Bump verision to 0.11.0.	2019-07-12 18:13:46 +02:00
Jørgen Henrichsen	565b9a04d4	Merge pull request #71 from dcvz/feature/asset-options Add ability to set asset init options	2019-07-12 18:12:23 +02:00
David Chavez	c2ec751ec0	Address review feedback	2019-07-10 13:56:05 +02:00
David Chavez	2c36c6c239	Add ability to set asset init options	2019-07-06 12:04:49 +02:00
Jørgen Henrichsen	1c4cbf676d	Merge pull request #70 from jorgenhenrichsen/more-detaile-player-states More detailed player states	2019-07-03 18:29:43 +02:00
Jørgen Henrichsen	ec9492da17	Add tests for the loading state.	2019-07-03 17:48:28 +02:00
Jørgen Henrichsen	5add7699ff	Added an example of how to handle network error. The example app will now handle a network error, and reload when play is called, after a item failed to load because of a network error.	2019-07-03 16:41:14 +02:00
Jørgen Henrichsen	bc1d775875	Reset audio file to spotify preview in example app.	2019-07-03 15:06:50 +02:00
Jørgen Henrichsen	4c1a545e87	Update podspec. Remove swift version file. Clean up the podspec file and set swift version to 5.0. Remove the .swift-version file as it's use is deprecated.	2019-07-03 14:53:24 +02:00
Jørgen Henrichsen	f31b52f81b	Make the ready state reachable for items with initial time. Fixes a problem where the .ready state would not be reached for audio items that had an initial time.	2019-07-03 14:25:43 +02:00
Jørgen Henrichsen	355c729078	Update README. Update podspec. Bump version to 0.10.0.	2019-07-03 13:22:27 +02:00
Jørgen Henrichsen	719d3c852b	Add an activityindicator to the example. Shows how an activityindicator can be used to indicate loading, when player is loading or buffering.	2019-07-03 13:21:41 +02:00
Jørgen Henrichsen	4f33d7e688	Add a new state `buffering`. Introduces an additional state to better describe the current state of the player. Previously the player would be `idle` until the item was loaded, then changing to `ready`. When the player started to play it would first enter `loading`, then subsequently `playing`. Now it will instead immediately enter `loading`, then when the item is loaded it will enter `ready`. When the item then is played it will enter `buffering` and then `playing`. This should make it easier to update UI accordingly to the players current state.	2019-07-03 11:23:10 +02:00
Jørgen Henrichsen	56d0633df0	Update README. Update podspec. Bump to version 0.9.3.	2019-07-01 16:23:01 +02:00
Jørgen Henrichsen	825e508ecb	Merge pull request #67 from jorgenhenrichsen/async-fixes Async fixes	2019-07-01 16:14:20 +02:00
Jørgen Henrichsen	76d9dc17af	Merge branch 'master' into async-fixes	2019-07-01 15:38:45 +02:00
Jørgen Henrichsen	8ceb0216a0	Merge pull request #65 from dcvz/feature/feedback-commands Add commands for like, dislike and bookmark	2019-07-01 15:38:33 +02:00
David Chavez	db41634631	Fix some missing sets	2019-06-25 10:49:10 +02:00
David Chavez	15843b5fe8	Add commands for like, dislike and bookmark	2019-06-24 23:57:17 +02:00
Jørgen Henrichsen	4241b484b2	Removed commented prints.	2019-06-23 18:19:08 +02:00
Jørgen Henrichsen	92bf0b96b6	Remove cancelloading in the load method. This was already done in the reset(soft:) method. Removed the nil check before canceling the pendingAsset load, since the coalescing `?` operator was already used anyway.	2019-06-23 18:13:48 +02:00
Jørgen Henrichsen	457dff7c01	Use weak capturing of the AudioPlayer. Remove initial time test. Weak capturing of the AudioPlayer is done in the listener callback functions in order to not receive INVOPs in the event the audioPlayer is deallocated. The initial time test is removed because of the unreliable results it produces.	2019-06-23 18:06:43 +02:00
Jørgen Henrichsen	c90e9c4976	Unregister observers in their deinit method.	2019-06-23 16:41:47 +02:00
Jørgen Henrichsen	649bb01e89	Weak self and cancel previous load in load(from:playWhenReady). Use weak self in the loadValuesAsync callback in the event where this is called after the player has be deintialized. Cancel loading the pendingAsset before loading a new one.	2019-06-23 16:35:50 +02:00