Release 2.6.0

Rename and deprecate initialize functions (#23 )
Release 2.5.2
2019-12-18 21:23:07 -08:00 · 2019-12-18 21:22:28 -08:00 · 2019-12-18 16:19:57 -08:00 · 2019-12-18 16:19:37 -08:00 · 2019-12-18 00:27:49 -08:00 · 2019-12-18 00:27:21 -08:00
28 changed files with 710 additions and 185 deletions
@@ -14,6 +14,8 @@
 		79D8DF73FA7CDD6E266BAE71D46E035F /* Pods-SwiftAudioPlayer_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 50C71346CE708A211A5AFAC20BAE48CB /* Pods-SwiftAudioPlayer_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		831B263D357A5FA2DDC7B1AE4B374092 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */; };
 		8F93DB166237195ED222EE55B6404625 /* Pods-SwiftAudioPlayer_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B0B76CB1439F4D361322144E5A65C3A /* Pods-SwiftAudioPlayer_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A40DBE292391D9CA00F86146 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40DBE282391D9C900F86146 /* Data.swift */; };
+		A41AA0D2238BB9B600A467E1 /* SAPlayingStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.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 */; };
@@ -95,6 +97,8 @@
 		99925F09FC9C6EA4B9C0508F4E2D1FE2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A19C8F889C787C19BE4123C1896AF501 /* Pods-SwiftAudioPlayer_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwiftAudioPlayer_Example-resources.sh"; sourceTree = "<group>"; };
 		A39F2A138CF40C1051CA9E227429A86D /* SwiftAudioPlayer.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SwiftAudioPlayer.modulemap; sourceTree = "<group>"; };
+		A40DBE282391D9C900F86146 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
+		A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayingStatus.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>"; };
@@ -271,6 +275,7 @@
 				A4681F872200DAD50018AB51 /* DirectorThreadSafeClosures.swift */,
 				A4681F892200DB3C0018AB51 /* Date.swift */,
 				A4681F962200E2E20018AB51 /* URL.swift */,
+				A40DBE282391D9C900F86146 /* Data.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -278,6 +283,7 @@
 		A4681F932200E2020018AB51 /* Engine */ = {
 			isa = PBXGroup;
 			children = (
+				A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.swift */,
 				A4FBA6B8221BAF8700D5A353 /* SAAudioAvailabilityRange.swift */,
 				A4681F822200D9150018AB51 /* AudioEngine.swift */,
 				A4681F942200E2220018AB51 /* AudioDiskEngine.swift */,
@@ -479,19 +485,23 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1010;
 				TargetAttributes = {
 					042ACE071BA515F4DE0E0C8007C3F0EE = {
 						LastSwiftMigration = 1010;
 					};
+					E50DAD13FFD3FC8036073A58BF8423D4 = {
+						LastSwiftMigration = 1120;
+					};
 				};
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 7DB346D0F39D3F0E887471402A8071AB;
 			productRefGroup = 21D946895A4F57F51246F3EBCF330719 /* Products */;
@@ -510,12 +520,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A41AA0D2238BB9B600A467E1 /* SAPlayingStatus.swift in Sources */,
 				A4681FDC220113D70018AB51 /* AudioDownloadWorker.swift in Sources */,
 				A4681FD8220113C60018AB51 /* AudioDataManager.swift in Sources */,
 				A4681FD1220113AF0018AB51 /* AudioParsable.swift in Sources */,
 				A4681FD2220113B20018AB51 /* AudioParser.swift in Sources */,
 				A4681FCF220113A40018AB51 /* AudioConverterListener.swift in Sources */,
 				A4681FE1220113E70018AB51 /* Constants.swift in Sources */,
+				A40DBE292391D9CA00F86146 /* Data.swift in Sources */,
 				A4FBA6B5221B74C900D5A353 /* SALockScreenInfo.swift in Sources */,
 				A4681FC6220113880018AB51 /* SAPlayer.swift in Sources */,
 				A4FBA6B7221BAC3D00D5A353 /* SAPlayerUpdateSubscription.swift in Sources */,
@@ -634,7 +646,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -669,7 +681,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -701,7 +713,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -796,10 +808,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Release;
@@ -207,25 +207,25 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = R2392A68YQ;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1120;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = R2392A68YQ;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1120;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "SwiftAudioPlayer" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -379,12 +379,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -432,12 +434,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -477,8 +481,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -493,8 +496,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -515,8 +517,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftAudioPlayer_Example.app/SwiftAudioPlayer_Example";
 			};
 			name = Debug;
@@ -534,8 +535,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftAudioPlayer_Example.app/SwiftAudioPlayer_Example";
 			};
 			name = Release;
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -70,7 +69,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }
@@ -32,7 +32,9 @@
                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <color key="maximumTrackTintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <connections>
-                                    <action selector="scrubberSeeked:" destination="vXZ-lx-hvc" eventType="valueChanged" id="jDA-wR-wxk"/>
+                                    <action selector="scrubberSeeked:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="hTi-fq-lrl"/>
+                                    <action selector="scrubberSeeked:" destination="vXZ-lx-hvc" eventType="touchUpOutside" id="mFP-SW-38w"/>
+                                    <action selector="scrubberStartedSeeking:" destination="vXZ-lx-hvc" eventType="touchDown" id="UXg-Wf-fKv"/>
                                </connections>
                            </slider>
                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jUc-tP-CC5">
@@ -57,11 +59,17 @@
                                </connections>
                            </button>
                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.10000000000000001" maxValue="32" translatesAutoresizingMaskIntoConstraints="NO" id="vfk-OJ-S3T">
-                                <rect key="frame" x="14" y="564" width="347" height="31"/>
+                                <rect key="frame" x="14" y="464" width="347" height="31"/>
                                <connections>
                                    <action selector="rateChanged:" destination="vXZ-lx-hvc" eventType="valueChanged" id="FDJ-jA-bm8"/>
                                </connections>
                            </slider>
+                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="300" minValue="0.10000000149011612" maxValue="1000" translatesAutoresizingMaskIntoConstraints="NO" id="nsl-df-P21">
+                                <rect key="frame" x="14" y="397" width="347" height="31"/>
+                                <connections>
+                                    <action selector="reverbChanged:" destination="vXZ-lx-hvc" eventType="valueChanged" id="J8Q-be-35q"/>
+                                </connections>
+                            </slider>
                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="joK-xi-MCo">
                                <rect key="frame" x="16" y="80" width="343" height="29"/>
                                <segments>
@@ -87,8 +95,8 @@
                                    <action selector="streamTouched:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="AXY-N7-87Y"/>
                                </connections>
                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="rate: 1.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yUQ-mI-ozK">
-                                <rect key="frame" x="157" y="535" width="61" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="rate: 1.0x" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yUQ-mI-ozK">
+                                <rect key="frame" x="153" y="435" width="69" height="21"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
@@ -111,9 +119,16 @@
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="reverb: 300.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y5i-MZ-Qat">
+                                <rect key="frame" x="136" y="368" width="103" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                        </subviews>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
+                            <constraint firstItem="nsl-df-P21" firstAttribute="top" secondItem="y5i-MZ-Qat" secondAttribute="bottom" constant="8" id="0aM-Sz-J9k"/>
                            <constraint firstItem="lTK-Hd-Tl2" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" constant="16" id="1wb-IW-jYz"/>
                            <constraint firstItem="j3w-gr-HzF" firstAttribute="leading" secondItem="lTK-Hd-Tl2" secondAttribute="leading" id="26c-ZJ-768"/>
                            <constraint firstItem="jUc-tP-CC5" firstAttribute="top" secondItem="KDu-ea-kF8" secondAttribute="bottom" constant="80" id="5sT-An-9vw"/>
@@ -125,24 +140,29 @@
                            <constraint firstItem="Urj-Dv-41y" firstAttribute="centerY" secondItem="j3w-gr-HzF" secondAttribute="centerY" id="Fvd-7V-Rr8"/>
                            <constraint firstItem="1IX-z5-wWx" firstAttribute="leading" secondItem="joK-xi-MCo" secondAttribute="leading" id="GeX-7f-jzu"/>
                            <constraint firstItem="0QE-3F-a4G" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="jUc-tP-CC5" secondAttribute="trailing" constant="8" symbolic="YES" id="JP5-yW-eVB"/>
-                            <constraint firstItem="yUQ-mI-ozK" firstAttribute="top" secondItem="w2a-RA-zmI" secondAttribute="bottom" constant="200" id="K1K-8N-SpD"/>
+                            <constraint firstItem="yUQ-mI-ozK" firstAttribute="top" secondItem="w2a-RA-zmI" secondAttribute="bottom" constant="100" id="K1K-8N-SpD"/>
                            <constraint firstItem="vfk-OJ-S3T" firstAttribute="leading" secondItem="lTK-Hd-Tl2" secondAttribute="leading" id="NOY-IO-NIJ"/>
                            <constraint firstItem="tFH-sY-Xu9" firstAttribute="centerY" secondItem="jUc-tP-CC5" secondAttribute="centerY" id="Rre-EY-kVY"/>
                            <constraint firstItem="KDu-ea-kF8" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" constant="78" id="SRU-sX-z5b"/>
                            <constraint firstItem="w2a-RA-zmI" firstAttribute="trailing" secondItem="lTK-Hd-Tl2" secondAttribute="trailing" id="Vki-IZ-AdN"/>
                            <constraint firstItem="lTK-Hd-Tl2" firstAttribute="top" secondItem="j3w-gr-HzF" secondAttribute="bottom" constant="8" id="Wwx-Uo-yIC"/>
+                            <constraint firstItem="nsl-df-P21" firstAttribute="leading" secondItem="vfk-OJ-S3T" secondAttribute="leading" id="a5C-nZ-8Jc"/>
                            <constraint firstItem="yUQ-mI-ozK" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="a66-h4-WVf"/>
                            <constraint firstItem="Urj-Dv-41y" firstAttribute="trailing" secondItem="lTK-Hd-Tl2" secondAttribute="trailing" id="aKt-EV-Bwd"/>
                            <constraint firstItem="tFH-sY-Xu9" firstAttribute="top" secondItem="1IX-z5-wWx" secondAttribute="bottom" constant="27" id="bIq-V0-Sac"/>
                            <constraint firstItem="tFH-sY-Xu9" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" constant="62.5" id="cH6-q6-Lel"/>
+                            <constraint firstItem="yUQ-mI-ozK" firstAttribute="top" secondItem="nsl-df-P21" secondAttribute="bottom" constant="8" id="cKV-wk-6P9"/>
                            <constraint firstItem="jUc-tP-CC5" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="cgM-Nj-yit"/>
                            <constraint firstItem="KDu-ea-kF8" firstAttribute="top" secondItem="joK-xi-MCo" secondAttribute="bottom" constant="32" id="dLw-rF-Pfb"/>
                            <constraint firstItem="w2a-RA-zmI" firstAttribute="leading" secondItem="lTK-Hd-Tl2" secondAttribute="leading" id="daz-b0-eCC"/>
                            <constraint firstItem="jUc-tP-CC5" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="tFH-sY-Xu9" secondAttribute="trailing" constant="8" symbolic="YES" id="fS9-Ce-4ph"/>
+                            <constraint firstItem="Urj-Dv-41y" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="j3w-gr-HzF" secondAttribute="trailing" constant="8" symbolic="YES" id="fu0-ZZ-rj9"/>
                            <constraint firstAttribute="trailing" secondItem="lTK-Hd-Tl2" secondAttribute="trailing" constant="16" id="gdg-7Y-7la"/>
                            <constraint firstAttribute="trailing" secondItem="1IX-z5-wWx" secondAttribute="trailing" constant="16" id="hHM-jO-RZd"/>
                            <constraint firstItem="6d9-Bc-hIz" firstAttribute="top" secondItem="joK-xi-MCo" secondAttribute="bottom" constant="32" id="m9s-An-IWV"/>
                            <constraint firstItem="vfk-OJ-S3T" firstAttribute="top" secondItem="yUQ-mI-ozK" secondAttribute="bottom" constant="8" id="oaW-rr-UVN"/>
+                            <constraint firstItem="nsl-df-P21" firstAttribute="trailing" secondItem="vfk-OJ-S3T" secondAttribute="trailing" id="r5e-Wq-dqV"/>
+                            <constraint firstItem="y5i-MZ-Qat" firstAttribute="centerX" secondItem="nsl-df-P21" secondAttribute="centerX" id="reC-GA-ZgT"/>
                            <constraint firstAttribute="trailing" secondItem="0QE-3F-a4G" secondAttribute="trailing" constant="62.5" id="tg1-gr-hdd"/>
                            <constraint firstAttribute="trailing" secondItem="6d9-Bc-hIz" secondAttribute="trailing" constant="82" id="vtN-y4-iqp"/>
                            <constraint firstItem="0QE-3F-a4G" firstAttribute="centerY" secondItem="jUc-tP-CC5" secondAttribute="centerY" id="xDi-tj-bBF"/>
@@ -160,6 +180,8 @@
                        <outlet property="playPauseButton" destination="jUc-tP-CC5" id="e9C-zV-A1B"/>
                        <outlet property="rateLabel" destination="yUQ-mI-ozK" id="Dx4-lO-A1B"/>
                        <outlet property="rateSlider" destination="vfk-OJ-S3T" id="mNc-ET-aNM"/>
+                        <outlet property="reverbLabel" destination="y5i-MZ-Qat" id="8YR-mc-GFA"/>
+                        <outlet property="reverbSlider" destination="nsl-df-P21" id="BKt-Hb-akj"/>
                        <outlet property="scrubberSlider" destination="w2a-RA-zmI" id="VbI-tT-lbc"/>
                        <outlet property="skipBackwardButton" destination="tFH-sY-Xu9" id="LwM-2S-m6F"/>
                        <outlet property="skipForwardButton" destination="0QE-3F-a4G" id="cQ7-b7-pW7"/>
@@ -22,6 +22,12 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>fetch</string>
+		<string>processing</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -8,6 +8,7 @@

 import UIKit
 import SwiftAudioPlayer
+import AVFoundation

 class ViewController: UIViewController {
    struct AudioInfo: Hashable {
@@ -74,11 +75,14 @@ class ViewController: UIViewController {
    
    @IBOutlet weak var rateLabel: UILabel!
    
+    @IBOutlet weak var reverbLabel: UILabel!
+    @IBOutlet weak var reverbSlider: UISlider!
    @IBOutlet weak var durationLabel: UILabel!
    @IBOutlet weak var currentTimestampLabel: UILabel!
    
    var isDownloading: Bool = false
    var isStreaming: Bool = false
+    var beingSeeked: Bool = false
    
    var duration: Double = 0.0
    
@@ -99,11 +103,11 @@ class ViewController: UIViewController {
    override func viewDidLoad() {
        super.viewDidLoad()
        
-        adjustSpeed()
-        
        isPlayable = false
        selectedAudio = AudioInfo(index: 0)
        
+        addRandomModifiers()
+        
        _ = SAPlayer.Updates.Duration.subscribe { [weak self] (url, duration) in
            guard let self = self else { return }
            guard url == self.selectedAudio.url || url == self.savedUrls[self.selectedAudio] else { return }
@@ -156,13 +160,32 @@ class ViewController: UIViewController {
            guard let self = self else { return }
            guard url == self.selectedAudio.url || url == self.savedUrls[self.selectedAudio] else { return }
            
-            if playing {
+            switch playing {
+            case .playing:
+                self.isPlayable = true
                self.playPauseButton.setTitle("Pause", for: .normal)
-            } else {
+                return
+            case .paused:
+                self.isPlayable = true
                self.playPauseButton.setTitle("Play", for: .normal)
+                return
+            case .buffering:
+                self.isPlayable = false
+                self.playPauseButton.setTitle("Loading", for: .normal)
+                return
+            case .ended:
+                self.isPlayable = false
+                self.playPauseButton.setTitle("Done", for: .normal)
+                return
            }
        }
    }
+    
+    func addRandomModifiers() {
+        let node = AVAudioUnitReverb()
+        SAPlayer.shared.audioModifiers.append(node)
+        node.wetDryMix = 300
+    }

    override func didReceiveMemoryWarning() {
        super.didReceiveMemoryWarning()
@@ -178,14 +201,31 @@ class ViewController: UIViewController {
        
        //        if let savedUrl = savedUrls[selectedAudio] {}
    }
+    @IBAction func scrubberStartedSeeking(_ sender: UISlider) {
+        beingSeeked = true
+    }
    
    @IBAction func scrubberSeeked(_ sender: Any) {
-        SAPlayer.shared.seekTo(seconds: Double(scrubberSlider.value))
+        let value = Double(scrubberSlider.value) * duration
+        SAPlayer.shared.seekTo(seconds: value)
+        beingSeeked = false
    }
    
    
    @IBAction func rateChanged(_ sender: Any) {
-        adjustSpeed()
+        let speed = rateSlider.value
+        rateLabel.text = "rate: \(speed)x"
+        if let node = SAPlayer.shared.audioModifiers[0] as? AVAudioUnitTimePitch {
+            node.rate = speed
+            SAPlayer.shared.playbackRateOfAudioChanged(rate: speed)
+        }
+    }
+    @IBAction func reverbChanged(_ sender: Any) {
+        let reverb = reverbSlider.value
+        reverbLabel.text = "reverb: \(reverb)"
+        if let node = SAPlayer.shared.audioModifiers[1] as? AVAudioUnitReverb {
+            node.wetDryMix = reverb
+        }
    }
    
    @IBAction func downloadTouched(_ sender: Any) {
@@ -204,7 +244,7 @@ class ViewController: UIViewController {
                        self.currentUrlLocationLabel.text = "saved to: \(url.lastPathComponent)"
                        self.savedUrls[self.selectedAudio] = url
                        
-                        SAPlayer.shared.initializeSavedAudio(withSavedUrl: url)
+                        SAPlayer.shared.startSavedAudio(withSavedUrl: url)
                    }
                })
                streamButton.isEnabled = false
@@ -219,7 +259,7 @@ class ViewController: UIViewController {
    
    @IBAction func streamTouched(_ sender: Any) {
        if !isStreaming {
-            SAPlayer.shared.initializeAudio(withRemoteUrl: selectedAudio.url)
+            SAPlayer.shared.startRemoteAudio(withRemoteUrl: selectedAudio.url)
            streamButton.setTitle("Cancel streaming", for: .normal)
            downloadButton.isEnabled = false
        } else {
@@ -239,11 +279,5 @@ class ViewController: UIViewController {
        SAPlayer.shared.skipForward()
    }
    
-    private func adjustSpeed() {
-        let speed = rateSlider.value
-        rateLabel.text = "rate: \(speed)x"
-        SAPlayer.shared.rate = Double(speed)
-    }
-    
 }

@@ -4,21 +4,24 @@
 [![License](https://img.shields.io/cocoapods/l/SwiftAudioPlayer.svg?style=flat)](https://cocoapods.org/pods/SwiftAudioPlayer)
 [![Platform](https://img.shields.io/cocoapods/p/SwiftAudioPlayer.svg?style=flat)](https://cocoapods.org/pods/SwiftAudioPlayer)

-Swift based audio player that is able to both stream remote audio and play locally saved audio, while performing audio manipulations in real-time. Underlying using AVAudioEngine, and you can change the rate of audio (up to 32x), change pitch, and [other audio enhancements](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements).
+Swift-based audio player with AVAudioEngine as its base. Allows for: streaming online audio, playing local file, changing audio speed (3.5X, 4X, 32X), pitch, and real-time audio manipulation using custom [audio enhancements](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements).

-This player was originally developed to be used in a [podcast player](https://chameleonpodcast.com/). We had originally used AVPlayer for playing audio but we wanted to manipulate audio that was being streamed. We set up AVAudioEngine at first just to play a file saved on the phone and it worked great, but AVAudioEngine on its own doesn't support streaming audio as easily as AVPlayer.
+This player was built for [podcasting](https://chameleonpodcast.com/). We originally used AVPlayer for playing audio but we wanted to manipulate audio that was being streamed. We set up AVAudioEngine at first just to play a file saved on the phone and it worked great, but AVAudioEngine on its own doesn't support streaming audio as easily as AVPlayer.

 Thus, using [AudioToolbox](https://developer.apple.com/documentation/audiotoolbox), we are able to stream audio and convert the downloaded data into usable data for the AVAudioEngine to play. For an overview of our solution check out our [blog post](https://medium.com/chameleon-podcast/creating-an-advanced-streaming-audio-engine-for-ios-9fbc7aef4115).

 ### Requirements

-SwiftAudioPlayer is only available for iOS 10.0 and higher.
+iOS 10.0 and higher.

 ## Getting Started

-### Example Project
+### Running the Example Project

-To run the example project, clone the repo, and run `pod install` from the Example directory first.
+1. Clone repo
+2. CD to directory
+3. Run `pod install` in terminal
+4. Build and run

 ### Installation

@@ -31,10 +34,12 @@ pod 'SwiftAudioPlayer'

 ### Usage

+**Important:** For app in background downloading please refer to [note](#important-step-for-background-downloads).
+
 To play remote audio:
 ```swift
 let url = URL(string: "https://randomwebsite.com/audio.mp3")!
-SAPlayer.shared.initializeAudio(withRemoteUrl: url)
+SAPlayer.shared.startRemoteAudio(withRemoteUrl: url)
 SAPlayer.shared.play()
 ```

@@ -44,7 +49,7 @@ let info = SALockScreenInfo(title: "Random audio", artist: "Foo", artwork: UIIma
 SAPlayer.shared.mediaInfo = info
 ```

-To receive streaming progress:
+To receive streaming progress (for buffer progress %):
 ```swift
@IBOutlet weak var bufferProgress: UIProgressView!

@@ -65,7 +70,26 @@ override func viewDidLoad() {
 ```
 Look at the [Updates](#SAPlayer.Updates) section to see usage details and other updates to follow.

-**Important:** For app in background downloading please refer to [note](#important-step-for-background-downloads).
+
+For realtime audio manipulations, [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/avaudiounit) nodes are used. For example to adjust the reverb through a slider in the UI:
+```swift
+@IBOutlet weak var reverbSlider: UISlider!
+
+override func viewDidLoad() {
+    super.viewDidLoad()
+
+    let node = AVAudioUnitReverb()
+    SAPlayer.shared.audioModifiers.append(node)
+    node.wetDryMix = 300
+}
+
+@IBAction func reverbSliderChanged(_ sender: Any) {
+    if let node = SAPlayer.shared.audioModifiers[1] as? AVAudioUnitReverb {
+            node.wetDryMix = reverbSlider.value
+        }
+}
+```
+For a more detailed explanation on usage, look at the [Realtime Audio Manipulations](#realtime-audio-manipulation) section.

 For more details and specifics look at the [API documentation](#api-in-detail) below.

@@ -90,6 +114,50 @@ SwiftAudioPlayer is available under the MIT license. See the LICENSE file for mo

 # API in detail

+## SAPlayer
+
+Access the player and all of its fields and functions through `SAPlayer.shared`.
+
+### Playing Audio (Basic Commands)
+
+To set up player with audio to play, use either: 
+* `startSavedAudio(withSavedUrl url: URL, mediaInfo: SALockScreenInfo?)` to play audio that is saved on the device.
+* `startRemoteAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo?)` to play audio streamed from a remote location.
+
+Both of these expect a URL of the location of the audio and an optional media information to display on the lockscreen. 
+
+For streaming remote audio, subscribe to `SAPlayer.Updates.StreamingBuffer` for updates on streaming progress.
+
+Basic controls available:
+```swift
+play()
+pause()
+togglePlayAndPause()
+seekTo(seconds: Double)
+skipForward()
+skipBackwards()
+```
+
+#### 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.
+
+### Lockscreen Media Player
+ 
+Update and set what displays on the lockscreen's media player when the player is active. 
+
+`skipForwardSeconds` and `skipBackwardSeconds` for the intervals to skip forward and back with.
+
+`mediaInfo` for the audio's information to display on the lockscreen. Is of type `SALockScreenInfo` which contains:
+```swift
+title: String
+artist: String
+artwork: UIImage?
+releaseDate: UTC // Int
+```
+
+`playbackRateOfAudioChanged(rate: Float)` is used to update the lockscreen media player that the playback rate has changed.
+
 ## SAPlayer.Downloader

 Use functionaity from Downloader to save audio files from remote locations for future offline playback.
@@ -108,7 +176,7 @@ func application(_ application: UIApplication, handleEventsForBackgroundURLSessi

 ### Downloading

-Downloads will be held on pause when active stream is started, and will resume downloads when streaming is done.
+All downloads will be paused when audio is streamed from a URL. They will automatically resume when streaming is done.

 Use the following to start downloading audio in the background:

@@ -118,6 +186,8 @@ func downloadAudio(withRemoteUrl url: URL, completion: @escaping (_ savedUrl: UR

 It will call the completion handler you pass after successful download with the location of the downloaded file on the device.

+Subscribe to `SAPlayer.Updates.AudioDownloading` for downloading progress updates.
+
 And use the following to stop any active or prevent future downloads of the corresponding remote URL:

 ```swift
@@ -143,6 +213,8 @@ Delete downloaded audio if it exists:
 func deleteDownloaded(withSavedUrl url: URL)
 ```

+**NOTE:** You're in charge or clearing downloads when your don't need them anymore
+
 ## SAPlayer.Updates

 Receive updates for changing values from the player, such as the duration, elapsed time of playing audio, download progress, and etc.
@@ -175,12 +247,12 @@ Subscribe to this to update views on changes in position of which part of audio
 ### Duration
 Payload = `Double`

-Changes in the duration of the current initialized audio. Especially helpful for audio that is being streamed and can change with more data.
+Changes in the duration of the current initialized audio. Especially helpful for audio that is being streamed and can change with more data. The engine makes a best effort guess as to the duration of the audio. The guess gets better with more bytes streamed from the web.

 ### PlayingStatus
-Payload = `Bool`
+Payload = `SAPlayingStatus`

-Changes in the playing/paused status of the player.
+Changes in the playing status of the player. Can be one of the following 4: `playing`, `paused`, `buffering`, `ended` (audio ended).

 ### StreamingBuffer
 Payload = `SAAudioAvailabilityRange`
@@ -193,3 +265,29 @@ For progress of downloading audio that saves to the phone for playback later, lo
 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.
+
+## Audio Effects
+
+### Realtime Audio Manipulation
+
+All audio effects on the player is done through [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/avaudiounit) nodes. These include adding reverb, changing pitch and playback rate, and adding distortion. Full list of effects available [here](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements).
+
+The effects intended to use are stored in `audioModifiers` as a list of nodes. These nodes are in the order that the engine will attach them to one another.
+
+**Note:** By default `SAPlayer` starts off with one node, an [AVAudioUnitTimePitch](https://developer.apple.com/documentation/avfoundation/avaudiounittimepitch) node, that is set to change the rate of audio without changing the pitch of the audio (intended for changing the rate of spoken word).
+
+#### Important
+All the nodes intended to be used on the playing audio must be finalized before calling `initializeSavedAudio(...)` or `initializeRemoteAudio(...)`. Any changes to list of nodes after initialize is called for a given audio file will not be reflected in playback.
+
+Once all nodes are added to `audioModifiers` and the player has been initialized, any manipulations done with the nodes are performed in realtime. The example app shows manipulating the playback rate in realtime:
+
+```swift
+let speed = rateSlider.value
+if let node = SAPlayer.shared.audioModifiers[0] as? AVAudioUnitTimePitch {
+    node.rate = speed
+    SAPlayer.shared.playbackRateOfAudioChanged(rate: speed)
+}
+```
+
+**Note:** if the rate of the audio is changed, `playbackRateOfAudioChanged` should also be called to update the lockscreen's media player.
+
@@ -31,7 +31,7 @@ class AudioClockDirector {
    
    private var needleClosures: DirectorThreadSafeClosures<Needle> = DirectorThreadSafeClosures()
    private var durationClosures: DirectorThreadSafeClosures<Duration> = DirectorThreadSafeClosures()
-    private var playingStatusClosures: DirectorThreadSafeClosures<IsPlaying> = DirectorThreadSafeClosures()
+    private var playingStatusClosures: DirectorThreadSafeClosures<SAPlayingStatus> = DirectorThreadSafeClosures()
    private var bufferClosures: DirectorThreadSafeClosures<SAAudioAvailabilityRange> = DirectorThreadSafeClosures()
    
    private init() {}
@@ -60,7 +60,7 @@ class AudioClockDirector {
    
    
    // Playing status
-    func attachToChangesInPlayingStatus(closure: @escaping (Key, IsPlaying) throws -> Void) -> UInt{
+    func attachToChangesInPlayingStatus(closure: @escaping (Key, SAPlayingStatus) throws -> Void) -> UInt{
        return playingStatusClosures.attach(closure: closure)
    }
    
@@ -103,12 +103,8 @@ extension AudioClockDirector {
 }

 extension AudioClockDirector {
-    func audioPaused(_ key: Key) {
-        playingStatusClosures.broadcast(key: key, payload: false)
-    }
-    
-    func audioPlaying(_ key: Key) {
-        playingStatusClosures.broadcast(key: key, payload: true)
+    func audioPlayingStatusWasChanged(_ key: Key, status: SAPlayingStatus) {
+        playingStatusClosures.broadcast(key: key, payload: status)
    }
 }

@@ -98,7 +98,7 @@ class AudioDiskEngine: AudioEngine {
            if state == .resumed {
                state = .suspended
            }
-            delegate?.didEndPlaying()
+            playingStatus = .ended
        }
        
        guard audioSampleRate != 0 else {
@@ -27,10 +27,10 @@ import Foundation
 import AVFoundation

 protocol AudioEngineProtocol {
+    var engine: AVAudioEngine { get set }
    func play()
    func pause()
    func seek(toNeedle needle: Needle)
-    func setSpeed(speed: Double)
    func invalidate()
 }

@@ -43,9 +43,8 @@ class AudioEngine: AudioEngineProtocol {
    weak var delegate:AudioEngineDelegate?
    let key:Key
    
-    let engine = AVAudioEngine()
+    var engine = AVAudioEngine()
    let playerNode = AVAudioPlayerNode()
-    let rateNode: AVAudioUnitTimePitch
    
    var timer: Timer?
    
@@ -57,12 +56,6 @@ class AudioEngine: AudioEngineProtocol {
        case resumed
    }
    
-    var audioSpeed: Double = 1.0 {
-        didSet {
-            rateNode.rate = Float(audioSpeed)
-        }
-    }
-    
    var needle: Needle = -1 {
        didSet {
            if needle >= 0 && oldValue != needle {
@@ -79,17 +72,17 @@ class AudioEngine: AudioEngineProtocol {
        }
    }
    
-    var isPlaying = false {
+    var playingStatus: SAPlayingStatus? = nil {
        didSet {
-            guard isPlaying != oldValue else {
+            guard playingStatus != oldValue, let status = playingStatus else {
                return
            }
            
-            if isPlaying {
-                AudioClockDirector.shared.audioPlaying(key)
-            } else {
-                AudioClockDirector.shared.audioPaused(key)
+            if status == .ended {
+                delegate?.didEndPlaying()
            }
+            
+            AudioClockDirector.shared.audioPlayingStatusWasChanged(key, status: status)
        }
    }
    
@@ -119,24 +112,35 @@ class AudioEngine: AudioEngineProtocol {
    init(url: AudioURL, delegate:AudioEngineDelegate?, engineAudioFormat: AVAudioFormat) {
        self.key = url.key
        self.delegate = delegate
-        // https://forums.developer.apple.com/thread/5874
-        // https://forums.developer.apple.com/thread/6050
-        // AVAudioTimePitchAlgorithm.timeDomain (just in case we want it)
-        var componentDescription: AudioComponentDescription {
-            get {
-                var ret = AudioComponentDescription()
-                ret.componentType = kAudioUnitType_FormatConverter
-                ret.componentSubType = kAudioUnitSubType_AUiPodTimeOther
-                return ret
-            }
-        }
-        
-        rateNode = AVAudioUnitTimePitch(audioComponentDescription: componentDescription)
        
        engine.attach(playerNode)
-        engine.attach(rateNode)
-        engine.connect(playerNode, to: rateNode, format: engineAudioFormat)
-        engine.connect(rateNode, to: engine.mainMixerNode, format: engineAudioFormat)
+        
+        for node in SAPlayer.shared.audioModifiers {
+            engine.attach(node)
+        }
+        
+        if SAPlayer.shared.audioModifiers.count > 0 {
+            var i = 0
+            
+            let node = SAPlayer.shared.audioModifiers[i]
+            engine.connect(playerNode, to: node, format: engineAudioFormat)
+            
+            i += 1
+            
+            while i < SAPlayer.shared.audioModifiers.count {
+                let lastNode = SAPlayer.shared.audioModifiers[i - 1]
+                let currNode = SAPlayer.shared.audioModifiers[i]
+                
+                engine.connect(lastNode, to: currNode, format: engineAudioFormat)
+                i += 1
+            }
+            
+            let finalNode = SAPlayer.shared.audioModifiers[SAPlayer.shared.audioModifiers.count - 1]
+            
+            engine.connect(finalNode, to: engine.mainMixerNode, format: engineAudioFormat)
+        } else {
+            engine.connect(playerNode, to: engine.mainMixerNode, format: engineAudioFormat)
+        }
        
        engine.prepare()
    }
@@ -149,7 +153,13 @@ class AudioEngine: AudioEngineProtocol {
    }
    
    func updateIsPlaying() {
-        isPlaying = engine.isRunning && playerNode.isPlaying
+        if !bufferedSeconds.isPlayable {
+            playingStatus = .buffering
+            return
+        }
+        
+        let isPlaying = engine.isRunning && playerNode.isPlaying
+        playingStatus = isPlaying ? .playing : .paused
    }
    
    func play() {
@@ -184,10 +194,6 @@ class AudioEngine: AudioEngineProtocol {
        fatalError("No implementation for seek inAudioEngine, should be using streaming or disk type")
    }
    
-    func setSpeed(speed: Double) {
-        audioSpeed = speed
-    }
-    
    func invalidate() {
        
    }
@@ -58,6 +58,7 @@ import AVFoundation
 class AudioStreamEngine: AudioEngine {
    //Constants
    private let MAX_POLL_BUFFER_COUNT = 300 //Having one buffer in engine at a time is choppy.
+    private let MIN_BUFFERS_TO_BE_PLAYABLE = 1
    private let PCM_BUFFER_SIZE: AVAudioFrameCount = 8192
    
    private let queue = DispatchQueue(label: "SwiftAudioPlayer.engine", qos: .userInitiated)
@@ -86,7 +87,9 @@ class AudioStreamEngine: AudioEngine {
        didSet {
            if numberOfBuffersScheduledFromPoll > MAX_POLL_BUFFER_COUNT {
                shouldPollForNextBuffer = false
-                
+            }
+            
+            if numberOfBuffersScheduledFromPoll > MIN_BUFFERS_TO_BE_PLAYABLE {
                if wasPlaying {
                    play()
                    wasPlaying = false
@@ -213,7 +216,7 @@ class AudioStreamEngine: AudioEngine {
    
    private func updateNetworkBufferRange() { //for ui
        let range = converter.pollNetworkAudioAvailabilityRange()
-        isPlayable = (numberOfBuffersScheduledInTotal > 0 && range.1 > 0) && predictedStreamDuration > 0
+        isPlayable = (numberOfBuffersScheduledInTotal >= MIN_BUFFERS_TO_BE_PLAYABLE && range.1 > 0) && predictedStreamDuration > 0
        Log.debug("loaded \(range), numberOfBuffersScheduledInTotal: \(numberOfBuffersScheduledInTotal), isPlayable: \(isPlayable)")
        bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: range.0, durationLoadedByNetwork: range.1, isPlayable: isPlayable)
    }
@@ -237,7 +240,7 @@ class AudioStreamEngine: AudioEngine {
            Log.info("reached end of audio")
            seek(toNeedle: 0)
            pause()
-            delegate?.didEndPlaying()
+            playingStatus = .ended
        }
        needle = (currentTime + currentTimeOffset)
    }
@@ -262,7 +265,6 @@ class AudioStreamEngine: AudioEngine {
        
        self.needle = needle //to tick while paused
        
-        
        queue.sync { [weak self] in
            self?.seekHelperDispatchQueue(needle: needle)
        }
@@ -290,6 +292,8 @@ class AudioStreamEngine: AudioEngine {
        playerNode.stop()
        
        shouldPollForNextBuffer = true
+        
+        updateNetworkBufferRange()
    }
    
    override func invalidate() {
@@ -36,6 +36,7 @@ protocol AudioThrottleable {
    func tellAudioFormatFound()
    func tellByteOffset(offset: UInt64)
    func tellSeek(offset: UInt64)
+    func tellBytesPerAudioPacket(count: UInt64)
    func pollRangeOfBytesAvailable() -> (UInt64, UInt64)
    func invalidate()
 }
@@ -96,18 +97,18 @@ class AudioThrottler: AudioThrottleable {
    private var networkData: [NetworkDataWrapper] = []
    var shouldThrottle = false
    var byteOffsetBecauseOfSeek: UInt = 0
-    var totalBytesExpected: Int64? //this got sent up twice. Once at beginning of stream and second from network seek. We honor the first send
    
-    var largestPollingOffsetDifference: UInt64 = 0
-    var lastOffsetPolled: UInt64 = 0 {
+    //This will be sent once at beginning of stream and every network seek
+    var totalBytesExpected: Int64? {
        didSet {
-            let diff = lastOffsetPolled - oldValue
-            if diff > largestPollingOffsetDifference {
-                largestPollingOffsetDifference = diff
+            if let bytes = totalBytesExpected {
+                delegate?.didUpdate(totalBytesExpected: Int64(byteOffsetBecauseOfSeek) + bytes)
            }
        }
    }
    
+    var largestPollingOffsetDifference: UInt64 = 1
+    
    required init(withRemoteUrl url: AudioURL, withDelegate delegate: AudioThrottleDelegate) {
        self.url = url
        self.delegate = delegate
@@ -117,9 +118,8 @@ class AudioThrottler: AudioThrottleable {
            Log.debug("received stream data of size \(pto.getData().count) and progress: \(pto.getProgress())")
            self.delegate?.didUpdate(networkStreamProgress: pto.getProgress())
            
-            if self.totalBytesExpected == nil, let totalBytesExpected = pto.getTotalBytesExpected() {
+            if let totalBytesExpected = pto.getTotalBytesExpected() {
                self.totalBytesExpected = totalBytesExpected
-                self.delegate?.didUpdate(totalBytesExpected: totalBytesExpected)
            }
            
            let lastItem = self.networkData.last
@@ -145,39 +145,48 @@ class AudioThrottler: AudioThrottleable {
        shouldThrottle = true //the above layer has enough info that we can throttle
    }
    
+    func tellBytesPerAudioPacket(count: UInt64) {
+        if count > largestPollingOffsetDifference {
+            largestPollingOffsetDifference = count
+        }
+    }
+    
    func tellByteOffset(offset: UInt64) {
        Log.debug("offset \(offset)")
-        lastOffsetPolled = offset
        
        for wrappedNetworkData in networkData {
            if wrappedNetworkData.containsOffset(UInt(offset)) {
                Log.debug("offset: \(offset) within network packet of range: \(wrappedNetworkData.startOffset) to \(wrappedNetworkData.endOffset) is next sent: \(wrappedNetworkData.isNextSent())")
                
                if wrappedNetworkData.alreadySent {
-                    if !wrappedNetworkData.isNextSent() {
-                        var bytesSent: UInt = 0
-                        var current = wrappedNetworkData
-                        
-                        // Sometimes the next data packet is smaller than a full audio chunk size, so we need to ensure we send up enough packets for the audio chunk. This prevented Issue #4 where tsreaming would randomly get stuck in a state needing more data up the chain.
-                        // https://github.com/tanhakabir/SwiftAudioPlayer/issues/4
-                        while bytesSent < largestPollingOffsetDifference {
-                            if let next = current.next {
-                                Log.debug("Sending next network packet with range: \(next.startOffset) to \(next.endOffset)")
+                    Log.debug("already sent offset: \(offset) within network packet of range: \(wrappedNetworkData.startOffset) to \(wrappedNetworkData.endOffset)")
+                    
+                    var bytesSent: UInt = 0
+                    var current = wrappedNetworkData
+                    
+                    // Sometimes the next data packet is smaller than a full audio chunk size, so we need to ensure we send up enough packets for the audio chunk. This prevented Issue #4 where tsreaming would randomly get stuck in a state needing more data up the chain.
+                    // https://github.com/tanhakabir/SwiftAudioPlayer/issues/4
+                    while bytesSent < largestPollingOffsetDifference {
+                        if let next = current.next {
+                            if !next.alreadySent {
+                                Log.info("Sending next network packet with range: \(next.startOffset) to \(next.endOffset), have sent \(bytesSent) bytes so far from \(largestPollingOffsetDifference) bytes")
                                next.alreadySent = true
                                delegate?.shouldProcess(networkData: next.data)
-                                bytesSent += next.byteCount
-                                current = next
-                            } else {
-                                return
                            }
+                            bytesSent += next.byteCount
+                            current = next
+                        } else {
+                            Log.debug("next package doesn't exist, bytes sent so far: \(bytesSent)")
+                            return
                        }
                    }
+                    
                    return
                }
                
-                Log.debug("Found network packet  to send with range: \(wrappedNetworkData.startOffset) to \(wrappedNetworkData.endOffset)")
-                delegate?.shouldProcess(networkData: wrappedNetworkData.data)
+                Log.info("Found network packet  to send with range: \(wrappedNetworkData.startOffset) to \(wrappedNetworkData.endOffset)")
                wrappedNetworkData.alreadySent = true
+                delegate?.shouldProcess(networkData: wrappedNetworkData.data)
                return
            }
        }
@@ -174,6 +174,10 @@ class AudioConverter: AudioConvertable {
    }
    
    private func getPacketIndex(forNeedle needle: Needle) -> AVAudioPacketCount? {
+        guard needle >= 0 else {
+            Log.error("needle should never be a negative number! needle received: \(needle)")
+            return nil
+        }
        guard let frame = frameOffset(forTime: TimeInterval(needle)) else { return nil }
        guard let framesPerPacket = parser.fileAudioFormat?.streamDescription.pointee.mFramesPerPacket else { return nil }
        return AVAudioPacketCount(frame) / AVAudioPacketCount(framesPerPacket)
@@ -70,7 +70,7 @@ func ConverterListener(_ converter: AudioConverterRef, _ packetCount: UnsafeMuta
    let packetByteCount = packet.count //this is not the count of an array
    ioData.pointee.mNumberBuffers = 1
    ioData.pointee.mBuffers.mData = UnsafeMutableRawPointer.allocate(byteCount: packetByteCount, alignment: 0)
-    _ = packet.withUnsafeMutableBytes({ (bytes: UnsafeMutablePointer<UInt8>) in
+    _ = packet.accessMutableBytes({ (bytes: UnsafeMutablePointer<UInt8>) in
        memcpy((ioData.pointee.mBuffers.mData?.assumingMemoryBound(to: UInt8.self))!, bytes, packetByteCount)
    })
    ioData.pointee.mBuffers.mDataByteSize = UInt32(packetByteCount)
@@ -85,7 +85,9 @@ class AudioParser: AudioParsable {
            return max(AVAudioPacketCount(parsedAudioHeaderPacketCount), AVAudioPacketCount(audioPackets.count))
        }
        
-        guard let sizeOfFileInBytes = expectedFileSizeInBytes, let bytesPerPacket = averageBytesPerPacket else {
+        let sizeOfFileInBytes: UInt64 = expectedFileSizeInBytes != nil ? expectedFileSizeInBytes! : 0
+        
+        guard let bytesPerPacket = averageBytesPerPacket else {
            return AVAudioPacketCount(0)
        }
        
@@ -98,7 +100,14 @@ class AudioParser: AudioParsable {
        return predictedCount
    }
    
-    var sumOfParsedAudioBytes:UInt32 = 0
+    var sumOfParsedAudioBytes:UInt32 = 0 {
+        didSet {
+            if let byteCount = averageBytesPerPacket {
+                throttler.tellBytesPerAudioPacket(count: UInt64(byteCount))
+            }
+        }
+    }
+    
    var numberOfPacketsParsed:UInt32 = 0
    var audioPackets: [(AudioStreamPacketDescription?,Data)] = [] { 
        didSet {
@@ -288,7 +297,7 @@ extension AudioParser: AudioThrottleDelegate {
            let sID = self.streamID!
            let dataSize = data.count
            
-            let _ = try data.withUnsafeBytes({ (bytes:UnsafePointer<UInt8>) in
+            _ = try data.accessBytes({ (bytes: UnsafePointer<UInt8>) in
                let result:OSStatus = AudioFileStreamParseBytes(sID, UInt32(dataSize), bytes, [])
                guard result == noErr else {
                    Log.monitor(ParserError.failedToParseBytes(result).errorDescription as Any)
@@ -0,0 +1,34 @@
+//
+//  SAPlayingStatus.swift
+//  SwiftAudioPlayer
+//
+//  Created by Tanha Kabir on 2019-11-24.
+//  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
+
+public enum SAPlayingStatus {
+    case playing
+    case paused
+    case buffering
+    case ended
+}
@@ -35,10 +35,19 @@ protocol LockScreenViewProtocol {
 }

 extension LockScreenViewProtocol {
+    func clearLockScreenInfo() {
+         MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
+    }
+    
    @available(iOS 10.0, *)
-    func setLockScreenInfo(withMediaInfo info: SALockScreenInfo, duration: Duration) {
+    func setLockScreenInfo(withMediaInfo info: SALockScreenInfo?, duration: Duration) {
        var nowPlayingInfo:[String : Any] = [:]
        
+        guard let info = info else {
+            MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
+            return
+        }
+        
        let title = info.title
        let artist = info.artist
        let releaseDate = info.releaseDate
@@ -68,10 +77,6 @@ extension LockScreenViewProtocol {
            }
        }
        
-        
-        
-        
-        
        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
    }
    
@@ -147,4 +152,23 @@ extension LockScreenViewProtocol {
    func updateLockscreenPlaybackDuration(duration: Duration) {
        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPMediaItemPropertyPlaybackDuration] = NSNumber(value: duration)
    }
+    
+    func updateLockscreenPaused(){
+        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0.0
+    }
+    
+    func updateLockscreenPlaying(){
+        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 1.0
+    }
+    
+    func updateLockscreenChangePlaybackRate(speed: Float){
+        if speed > 0.0{
+            MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = speed
+        }
+    }
+    
+    func updateLockscreenSkipIntervals() {
+        MPRemoteCommandCenter.shared().skipBackwardCommand.preferredIntervals = [skipBackwardSeconds] as [NSNumber]
+        MPRemoteCommandCenter.shared().skipForwardCommand.preferredIntervals = [skipForwardSeconds] as [NSNumber]
+    }
 }
@@ -271,21 +271,18 @@ extension AudioDownloadWorker {
            return lhs.id == rhs.id && lhs.remoteUrl == rhs.remoteUrl
        }
        
-        var hashValue: Int {
-            return id.hashValue ^ remoteUrl.hashValue
-        }
-        
        let id: ID
        let remoteUrl: URL
        let rank: Int
        var completionHandlers: [(URL) -> ()]
+        
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(id)
+            hasher.combine(remoteUrl)
+        }
    }
    
    private class ActiveDownload: Hashable {
-        var hashValue: Int {
-            return info.id.hashValue ^ task.hashValue
-        }
-        
        static func == (lhs: AudioDownloadWorker.ActiveDownload, rhs: AudioDownloadWorker.ActiveDownload) -> Bool {
            return lhs.info.id == rhs.info.id
        }
@@ -299,6 +296,11 @@ extension AudioDownloadWorker {
            self.info = info
            self.task = task
        }
+        
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(info.id)
+            hasher.combine(task)
+        }
    }
 }

@@ -247,11 +247,15 @@ extension AudioStreamWorker: URLSessionDataDelegate {
            return
        }
        
-        guard let totalBytesExpected = totalBytesExpectedForCurrentStream, totalBytesExpected > 0 else {
+        guard var totalBytesExpected = totalBytesExpectedForCurrentStream else {
            Log.monitor("should not be called 223r2")
            return
        }
        
+        if totalBytesExpected <= 0 {
+            totalBytesExpected = totalBytesReceived
+        }
+        
        totalBytesReceived = totalBytesReceived + Int64(data.count)
        let progress = Double(totalBytesReceived)/Double(totalBytesExpected)
        
@@ -27,55 +27,156 @@ import Foundation
 import AVFoundation

 public class SAPlayer {
+    /**
+     Access to the player.
+     */
    public static let shared: SAPlayer = SAPlayer()
+    
    private var presenter: SAPlayerPresenter!
    private var player: AudioEngine?
    
-    public var skipForwardSeconds: Double = 30
-    public var skipBackwardSeconds: Double = 15
+    /**
+    Access the engine of the player. Engine is nil if player has not been initialized with audio.
+     
+     - Important: Changes to the engine are not safe guarded, thus unknown behaviour can arise from changing the engine. Just be wary and read [documentation of AVAudioEngine](https://developer.apple.com/documentation/avfoundation/avaudioengine) well when modifying,
+    */
+    public var engine: AVAudioEngine? {
+        get {
+            return player?.engine
+        }
+    }
    
-    public var rate: Double = 1.0 {
+    /**
+    Corresponding to the overall volume of the player. Volume's default value is 1.0 and the range of valid values is 0.0 to 1.0. Volume is nil if no audio has been initialized yet.
+    */
+    public var volume: Float? {
+        get {
+            return player?.engine.mainMixerNode.volume
+        }
+        
+        set {
+            guard let value = newValue else { return }
+            guard value >= 0.0 && value <= 1.0 else { return }
+            
+            player?.engine.mainMixerNode.volume = value
+        }
+    }
+    
+    /**
+     Corresponding to the skipping forward button on the media player on the lockscreen. Default is set to 30 seconds.
+     */
+    public var skipForwardSeconds: Double = 30 {
        didSet {
-            presenter.handleSetSpeed(withMultiple: rate)
+            presenter.handleScrubbingIntervalsChanged()
        }
    }
    
-    public var duration: Double {
+    /**
+     Corresponding to the skipping backwards button on the media player on the lockscreen. Default is set to 15 seconds.
+     */
+    public var skipBackwardSeconds: Double = 15 {
+        didSet {
+            presenter.handleScrubbingIntervalsChanged()
+        }
+    }
+    
+    /**
+     List of [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements) audio modifiers to pass to the engine on initialization.
+     
+     - Important: To have the intended effects, the list of modifiers must be finalized before initializing the audio to be played. The modifers are added to the engine in order of the list.
+     
+     - Note: The default list already has an AVAudioUnitTimePitch node first in the list. This node is specifically set to change the rate of audio without changing the pitch of the audio (intended for changing the rate of spoken word).
+     
+         The component description of this node is:
+         ````
+         var componentDescription: AudioComponentDescription {
+            get {
+                var ret = AudioComponentDescription()
+                ret.componentType = kAudioUnitType_FormatConverter
+                ret.componentSubType = kAudioUnitSubType_AUiPodTimeOther
+                return ret
+            }
+         }
+         ````
+         Please look at [forums.developer.apple.com/thread/5874](https://forums.developer.apple.com/thread/5874) and [forums.developer.apple.com/thread/6050](https://forums.developer.apple.com/thread/6050) for more details.
+     */
+    public var audioModifiers: [AVAudioUnit] = []
+    
+    /**
+     Total duration of current audio initialized. Returns nil if no audio is initialized in player.
+     
+     - 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, this value will be constantly updating to best known value at the time.
+     */
+    public var duration: Double? {
        get {
-            return presenter.duration ?? 0.0
+            return presenter.duration
        }
    }
    
-    public var prettyDuration: String {
+    /**
+     A textual representation of the duration of the current audio initialized. Returns nil if no audio is initialized in player.
+     */
+    public var prettyDuration: String? {
        get {
-            return SAPlayer.prettifyTimestamp(duration)
+            guard let d = duration else { return nil }
+            return SAPlayer.prettifyTimestamp(d)
        }
    }
    
-    public var elapsedTime: Double {
+    /**
+     Elapsed playback time of the current audio initialized. Returns nil if no audio is initialized in player.
+     */
+    public var elapsedTime: Double? {
        get {
-            return presenter.needle ?? 0
+            return presenter.needle
        }
    }
    
-    public var prettyElapsedTime: String {
+    /**
+     A textual representation of the elapsed playback time of the current audio initialized. Returns nil if no audio is initialized in player.
+     */
+    public var prettyElapsedTime: String? {
        get {
-            return SAPlayer.prettifyTimestamp(elapsedTime)
+            guard let e = elapsedTime else { return nil }
+            return SAPlayer.prettifyTimestamp(e)
        }
    }
    
+    /**
+     Corresponding to the media info to display on the lockscreen for the current audio.
+     
+     - Note: Setting this to nil clears the information displayed on the lockscreen media player.
+     */
    public var mediaInfo: SALockScreenInfo? = nil {
        didSet {
-            if let info = mediaInfo {
-                presenter.handleLockscreenInfo(info: info)
-            }
+            presenter.handleLockscreenInfo(info: mediaInfo)
        }
    }
    
    private init() {
        presenter = SAPlayerPresenter(delegate: self)
+        
+        // https://forums.developer.apple.com/thread/5874
+        // https://forums.developer.apple.com/thread/6050
+        // AVAudioTimePitchAlgorithm.timeDomain (just in case we want it)
+        var componentDescription: AudioComponentDescription {
+            get {
+                var ret = AudioComponentDescription()
+                ret.componentType = kAudioUnitType_FormatConverter
+                ret.componentSubType = kAudioUnitSubType_AUiPodTimeOther
+                return ret
+            }
+        }
+        
+        audioModifiers.append(AVAudioUnitTimePitch(audioComponentDescription: componentDescription))
    }
    
+    /**
+     Formats a textual representation of a given timestamp for display in hh:MM:SS format, that is hours:minutes:seconds.
+
+     - Parameter timestamp: The timestamp to format.
+     - Returns: A textual representation of the given timestamp
+     */
    public static func prettifyTimestamp(_ timestamp: Double) -> String {
        let hours = Int(timestamp / 60 / 60)
        let minutes = Int((timestamp - Double(hours * 60)) / 60)
@@ -96,39 +197,118 @@ public class SAPlayer {

 //MARK: - External Player Controls
 extension SAPlayer {
+    /**
+     Toggles between the play and pause state of the player. If nothing is playable (aka still in buffering state or no audio is initialized) no action will be taken. Please call `startSavedAudio` or `startRemoteAudio` to set up the player with audio before this.
+     
+     - Note: If you are streaming, wait till the status from `SAPlayer.Updates.PlayingStatus` is not `.buffering`.
+     */
    public func togglePlayAndPause() {
        presenter.handleTogglePlayingAndPausing()
    }
    
+    /**
+     Attempts to play the player. If nothing is playable (aka still in buffering state or no audio is initialized) no action will be taken. Please call `startSavedAudio` or `startRemoteAudio` to set up the player with audio before this.
+     
+     - Note: If you are streaming, wait till the status from `SAPlayer.Updates.PlayingStatus` is not `.buffering`.
+     */
    public func play() {
        presenter.handlePlay()
    }
    
+    /**
+     Attempts to pause the player. If nothing is playable (aka still in buffering state or no audio is initialized) no action will be taken. Please call `startSavedAudio` or `startRemoteAudio` to set up the player with audio before this.
+     
+     - Note:If you are streaming, wait till the status from `SAPlayer.Updates.PlayingStatus` is not `.buffering`.
+     */
    public func pause() {
        presenter.handlePause()
    }
    
-    public func skipBackwards() {
-        presenter.handleSkipBackward()
-    }
-    
+    /**
+     Attempts to skip forward in audio even if nothing playable is loaded (aka still in buffering state or no audio is initialized). The interval to which to skip forward is defined by `SAPlayer.shared.skipForwardSeconds`.
+     
+     - Note: The skipping is limited to the duration of the audio, if the intended skip is past the duration of the current audio, the skip will just go to the end.
+     */
    public func skipForward() {
        presenter.handleSkipForward()
    }
    
+    /**
+     Attempts to skip backwards in audio even if nothing playable is loaded (aka still in buffering state or no audio is initialized). The interval to which to skip backwards is defined by `SAPlayer.shared.skipBackwardSeconds`.
+     
+     - Note: The skipping is limited to the playable timestamps, if the intended skip is below 0 seconds, the skip will just go to 0 seconds.
+     */
+    public func skipBackwards() {
+        presenter.handleSkipBackward()
+    }
+    
+    /**
+     Attempts to seek/scrub through the audio even if nothing playable is loaded (aka still in buffering state or no audio is initialized).
+     
+     - Parameter seconds: The intended seconds within the audio to seek to.
+     
+     - Note: The seeking is limited to the playable timestamps, if the intended seek is below 0 seconds, the skip will just go to 0 seconds. If the intended seek is past the curation of the current audio, the seek will just go to the end.
+     */
    public func seekTo(seconds: Double) {
        presenter.handleSeek(toNeedle: seconds)
    }
    
+    /**
+     If using an AVAudioUnitTimePitch, it's important to notify the player that the rate at which the audio playing has changed to keep the media player in the lockscreen up to date. This is only important for playback rate changes.
+     
+     - Parameter rate: The current rate at which the audio is playing.
+     */
+    public func playbackRateOfAudioChanged(rate: Float) {
+        presenter.handleAudioRateChanged(rate: rate)
+    }
+    
+    /**
+     Sets up player to play audio that has been saved on the device.
+     
+     - Important: If intending to use [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements) audio modifiers during playback, the list of audio modifiers under `SAPlayer.shared.audioModifiers` must be finalized before calling this function. After all realtime audio manipulations within the this will be effective.
+     
+     - Parameter withSavedUrl: The URL of the audio saved on the device.
+     - Parameter mediaInfo: The media information of the audio to show on the lockscreen media player (optional).
+     */
+    public func startSavedAudio(withSavedUrl url: URL, mediaInfo: SALockScreenInfo? = nil) {
+        self.mediaInfo = mediaInfo
+        presenter.handlePlaySavedAudio(withSavedUrl: url)
+    }
+    
+    @available(*, deprecated, renamed: "startSavedAudio")
    public func initializeSavedAudio(withSavedUrl url: URL, mediaInfo: SALockScreenInfo? = nil) {
        self.mediaInfo = mediaInfo
        presenter.handlePlaySavedAudio(withSavedUrl: url)
    }
    
-    public func initializeAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo? = nil) {
+    /**
+     Sets up player to play audio that will be streamed from a remote location. After this is called, it will connect to the server and start to receive and process data. The player is not playable the SAAudioAvailabilityRange notifies that player is ready for playing (you can subscribe to these updates through `SAPlayer.Updates.StreamingBuffer`). You can alternatively see when the player is available to play by subscribing to `SAPlayer.Updates.PlayingStatus` and waiting for a status that isn't `.buffering`.
+     
+     - Important: If intending to use [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements) audio modifiers during playback, the list of audio modifiers under `SAPlayer.shared.audioModifiers` must be finalized before calling this function. After all realtime audio manipulations within the this will be effective.
+     
+     - Note: Subscribe to `SAPlayer.Updates.StreamingBuffer` to see updates in streaming progress.
+     
+     - Parameter withRemoteUrl: The URL of the remote audio.
+     - Parameter mediaInfo: The media information of the audio to show on the lockscreen media player (optional).
+     */
+    public func startRemoteAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo? = nil) {
        self.mediaInfo = mediaInfo
        presenter.handlePlayStreamedAudio(withRemoteUrl: url)
    }
+    
+    @available(*, deprecated, renamed: "startRemoteAudio")
+    public func initializeRemoteAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo? = nil) {
+        self.mediaInfo = mediaInfo
+        presenter.handlePlayStreamedAudio(withRemoteUrl: url)
+    }
+    
+    /**
+     Resets the player to the state before initializing audio and setting media info.
+     */
+    public func clear() {
+        player = nil
+        presenter.handleClear()
+    }
 }


@@ -159,7 +339,9 @@ extension SAPlayer: SAPlayerDelegate {
            } else {
                // Fallback on earlier versions
            }
-            try AVAudioSession.sharedInstance().setActive(true, with: .notifyOthersOnDeactivation)
+            try AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, mode: AVAudioSession.Mode(rawValue: convertFromAVAudioSessionMode(AVAudioSession.Mode.default)), options: .allowAirPlay)
+
+            try AVAudioSession.sharedInstance().setActive(true, options: .notifyOthersOnDeactivation)
        } catch {
            Log.monitor("Problem setting up AVAudioSession to play in:: \(error.localizedDescription)")
        }
@@ -170,11 +352,14 @@ extension SAPlayer: SAPlayerDelegate {
    }
    
    func seekEngine(toNeedle needle: Needle) {
-        player?.seek(toNeedle: needle)
-    }
-    
-    func setSpeedEngine(withMultiple multiple: Double) {
-        player?.setSpeed(speed: multiple)
+        var seekToNeedle = needle < 0 ? 0 : needle
+        seekToNeedle = needle > Needle(duration ?? 0) ? Needle(duration ?? 0) : needle
+        player?.seek(toNeedle: seekToNeedle)
    }
 }

+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String {
+	return input.rawValue
+}
@@ -35,5 +35,4 @@ protocol SAPlayerDelegate: AnyObject, LockScreenViewProtocol {
    func playEngine()
    func pauseEngine()
    func seekEngine(toNeedle needle: Needle) //TODO ensure that engine cleans up out of bounds
-    func setSpeedEngine(withMultiple multiple: Double)
 }
@@ -41,6 +41,8 @@ extension SAPlayer {
         
         - Note: It's recommended to have a weak reference to a class that uses this function
         
+         - Note: Subscribe to `SAPlayer.Updates.AudioDownloading` to see updates in downloading progress.
+         
         - Parameter url: The remote url to download audio from.
         - Parameter completion: Completion handler that will return once the download is successful and complete.
         - Parameter savedUrl: The url of where the audio was saved locally on the device. Will receive once download has completed.
@@ -35,7 +35,7 @@ class SAPlayerPresenter {
    var duration: Duration?
    
    private var key: String?
-    private var isPlaying = false
+    private var isPlaying: SAPlayingStatus = .buffering
    private var mediaInfo: SALockScreenInfo?
    
    private var urlKeyMap: [Key: URL] = [:]
@@ -60,6 +60,18 @@ class SAPlayerPresenter {
        urlKeyMap[url.key] = url
    }
    
+    func handleClear() {
+        needle = nil
+        duration = nil
+        key = nil
+        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)
        delegate?.startAudioDownloaded(withSavedUrl: url)
@@ -88,9 +100,7 @@ class SAPlayerPresenter {
            self.delegate?.updateLockscreenPlaybackDuration(duration: duration)
            self.duration = duration
            
-            if let info = self.mediaInfo {
-                self.delegate?.setLockScreenInfo(withMediaInfo: info, duration: duration)
-            }
+            self.delegate?.setLockScreenInfo(withMediaInfo: self.mediaInfo, duration: duration)
        })
        
        needleRef = AudioClockDirector.shared.attachToChangesInNeedle(closure: { [weak self] (key, needle) in
@@ -116,7 +126,7 @@ class SAPlayerPresenter {
    }
    
    @available(iOS 10.0, *)
-    func handleLockscreenInfo(info: SALockScreenInfo) {
+    func handleLockscreenInfo(info: SALockScreenInfo?) {
        self.mediaInfo = info
    }
 }
@@ -126,16 +136,18 @@ class SAPlayerPresenter {
 extension SAPlayerPresenter {
    func handlePause() {
        delegate?.pauseEngine()
+        self.delegate?.updateLockscreenPaused()
    }
    
    func handlePlay() {
        delegate?.playEngine()
+        self.delegate?.updateLockscreenPlaying()
    }
    
    func handleTogglePlayingAndPausing() {
-        if isPlaying {
+        if isPlaying == .playing {
            handlePause()
-        } else {
+        } else if isPlaying == .paused {
            handlePlay()
        }
    }
@@ -154,15 +166,19 @@ extension SAPlayerPresenter {
        delegate?.seekEngine(toNeedle: needle)
    }
    
-    func handleSetSpeed(withMultiple: Double) {
-        delegate?.setSpeedEngine(withMultiple: withMultiple)
+    func handleAudioRateChanged(rate: Float) {
+        delegate?.updateLockscreenChangePlaybackRate(speed: rate)
+    }
+    
+    func handleScrubbingIntervalsChanged() {
+        delegate?.updateLockscreenSkipIntervals()
    }
 }

 //MARK:- For lock screen
 extension SAPlayerPresenter {
    func getIsPlaying() -> Bool {
-        return isPlaying
+        return isPlaying == .playing
    }
 }

@@ -66,12 +66,16 @@ extension SAPlayer {
        
        /**
         Updates to changes in the duration of the current initialized audio. Especially helpful for audio that is being streamed and can change with more data.
+         
+         - 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).
         */
        public struct Duration {
            
            /**
             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.
@@ -111,7 +115,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.
             */
-            public static func subscribe(_ closure: @escaping (_ url: URL, _ playingStatus: Bool) -> ()) -> UInt {
+            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 }
                    closure(url, isPlaying)
@@ -136,6 +140,8 @@ 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.
@@ -0,0 +1,54 @@
+//
+//  Data.swift
+//  SwiftAudioPlayer
+//
+//  Created by Tanha Kabir on 2019-11-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
+
+extension Data {
+    // Introduced in Swift 5, withUnsafeBytes using UnsafePointers is deprecated
+    // https://mjtsai.com/blog/2019/03/27/swift-5-released/
+    func accessBytes<R>(_ body: (UnsafePointer<UInt8>) throws -> R) rethrows -> R {
+        return try withUnsafeBytes { (rawBufferPointer: UnsafeRawBufferPointer) -> R in
+            let unsafeBufferPointer = rawBufferPointer.bindMemory(to: UInt8.self)
+            guard let unsafePointer = unsafeBufferPointer.baseAddress else {
+                Log.error("")
+                var int: UInt8 = 0
+                return try body(&int)
+            }
+            return try body(unsafePointer)
+        }
+    }
+    
+    mutating func accessMutableBytes<R>(_ body: (UnsafeMutablePointer<UInt8>) throws -> R) rethrows -> R {
+        return try withUnsafeMutableBytes { (rawBufferPointer: UnsafeMutableRawBufferPointer) -> R in
+            let unsafeMutableBufferPointer = rawBufferPointer.bindMemory(to: UInt8.self)
+            guard let unsafeMutablePointer = unsafeMutableBufferPointer.baseAddress else {
+                Log.error("")
+                var int: UInt8 = 0
+                return try body(&int)
+            }
+            return try body(unsafeMutablePointer)
+        }
+    }
+}
@@ -23,7 +23,7 @@ class Log {
    }
    
    // Specify which types of log messages to display. Default level is set to WARN, which means Log will print any log messages of type only WARN, ERROR, MONITOR, and TEST. To print DEBUG and INFO logs, set the level to a lower value.
-    public static var logLevel: LogLevel = LogLevel.ERROR
+    public static var logLevel: LogLevel = LogLevel.MONITOR
    
    // Used for OSLog
    private static let SUBSYSTEM: String = "com.SwiftAudioPlayer"
@@ -8,7 +8,7 @@

 Pod::Spec.new do |s|
  s.name             = 'SwiftAudioPlayer'
-  s.version          = '1.1.0'
+  s.version          = '2.6.0'
  s.summary          = 'SwiftAudioPlayer is a Swift based audio player that can handle streaming from a remote location and audio manipulation.'

 # This description is used to generate tags and improve search results.
@@ -31,7 +31,7 @@ SwiftAudioPlayer is a Swift based audio player that can handle streaming from a
  s.ios.deployment_target = '10.0'

  s.source_files = 'Source/**/*'
-  s.swift_version = '4.0'
+  s.swift_version = '5.0'
  
  # s.resource_bundles = {
  #   'SwiftAudioPlayer' => ['SwiftAudioPlayer/Assets/*.png']
Author	SHA1	Message	Date
Tanha	1373a816a6	Release 2.6.0	2019-12-18 21:23:07 -08:00
tanhakabir	196b04a703	Rename and deprecate initialize functions (#23 )	2019-12-18 21:22:28 -08:00
Tanha	ac971e65a6	Release 2.5.2	2019-12-18 16:19:57 -08:00
Tanha	2c50502b28	update documentation for live streaming audio	2019-12-18 16:19:37 -08:00
Tanha	c222b5a745	Release 2.5.1	2019-12-18 00:27:49 -08:00
Tanha	2e86a6503c	Clean up debug logging	2019-12-18 00:27:21 -08:00
Tanha	9ebd7fa7fe	Release 2.5.0	2019-12-18 00:24:11 -08:00
tanhakabir	5197a16023	Fix live streams/servers with unpredictable size at beginning of stream being playable (#21 ) * Handle case when header for stream does not contain expected content * update documentation * fix elapsed time updating on seek in example app	2019-12-18 00:22:31 -08:00
Tanha	159627c63e	Release 2.4.0	2019-12-03 01:43:45 -08:00
tanhakabir	07230cce1a	add another status to PlayingStatus for end of audio (#19 )	2019-12-03 01:42:56 -08:00
tanhakabir	a33aee80d1	Expose engine outside of SAPlayer (#18 ) * expose engine outside of player * add player clearing functionality	2019-12-03 01:25:58 -08:00
tanhakabir	e1d3da1ddb	Update README.md	2019-12-01 11:10:12 -08:00
Tanha	8c2524d990	Release 2.3.0	2019-12-01 01:17:54 -08:00
Tanha	be1b7aa05f	fix bug on bad network and streaming being stuck in missing data state close #4	2019-12-01 01:16:03 -08:00
Tanha	4b57fee75c	Release 2.2.0	2019-11-29 17:18:33 -08:00
tanhakabir	fc9c43a23c	Update accessing bytes of Data for Swift 5 (#17 )	2019-11-29 17:16:53 -08:00
Tanha	fd4e4e3b77	Release 2.1.0	2019-11-28 21:37:16 -08:00
tanhakabir	f1200252be	Update to Swift 5 (#16 )	2019-11-28 21:36:30 -08:00
Jonathan Mercer	046e64b2b8	Update README.md (#15 ) * Update readme - Completely re-worded the first paragraph - Re-worded some sentences that confused me - Moved audio manipulation in the end. Assuming that advanced users will read it there while keeping it hidden from other users * Update README.md	2019-11-27 16:36:24 -08:00
Tanha	ad9e40ad1c	Update README.md	2019-11-26 01:37:53 -08:00
Tanha	f19eaf7ec9	Release 2.0.1	2019-11-26 01:04:51 -08:00
tanhakabir	012291c1c9	Merge pull request #14 from tanhakabir/open_nodes_interface Open interface to control audio manipulation nodes	2019-11-26 01:03:11 -08:00
Tanha	70ba1c757e	add controls for realtime reverb change in example app	2019-11-26 01:02:06 -08:00
Tanha	3ab47b568d	nit	2019-11-26 00:53:52 -08:00
Tanha	6fd985d2ad	Update documentation	2019-11-26 00:52:18 -08:00
Tanha	cf028e0e36	nit rename	2019-11-26 00:52:08 -08:00
Tanha	f9e6dafc2c	add documentation for player functions	2019-11-26 00:00:44 -08:00
Tanha	e562a259fb	only show monitoring worthy errors outside of library	2019-11-25 23:48:24 -08:00
Tanha	9594b560d0	update lockscreen interval skip control on change of fields	2019-11-25 23:23:07 -08:00
Tanha	bf2dae9569	add documentation for fields of SAPlayer	2019-11-25 23:19:29 -08:00
Tanha	90ac3a4336	clean up typing for rate	2019-11-25 22:23:05 -08:00
Tanha	395364b4eb	test run with more modifiers	2019-11-25 22:17:55 -08:00
Tanha	6a2bb94037	fix freezing bug	2019-11-25 22:17:07 -08:00
Tanha	7d81953b83	removed usage of rate/speed within the engine	2019-11-25 22:10:57 -08:00
Tanha	feb69174ae	refactor to have external to library control nodes	2019-11-25 21:57:55 -08:00
Tanha	00eee68aab	silenced warnings for example app	2019-11-25 21:01:53 -08:00
Tanha	6276e97c4c	Release 1.3.0	2019-11-25 20:58:29 -08:00
Tanha	09142ce2d4	update to Swift 4.2	2019-11-25 20:57:54 -08:00
Tanha	90bc2262ec	Release 1.2.0	2019-11-25 15:12:55 -08:00
Tanha	9594449215	nit	2019-11-25 15:05:49 -08:00
Tanha	6187c9f438	fix playing on seek	2019-11-25 14:30:30 -08:00
Tanha	b28e815545	rename clean up	2019-11-25 13:49:06 -08:00
Tanha	17be73bbe8	fix fatal bug seeking	2019-11-25 13:44:54 -08:00
tanhakabir	cd35f38db1	Merge pull request #13 from tanhakabir/fix_ui_seeking_bug Fix ui when seeking to show "Loading" when not enough buffers ready	2019-11-25 10:44:28 -08:00
cendolinside123	3c752d581d	Fix miniplayer on background (#12 ) * 1. fix AVAudioSession configuration * 1. fix seek bar didn't update on miniplayer on lockscreen when playing a song 2. setup miniplayer lockscreen seek bar speed (when slide rate slider) * setup project example to playing on the background	2019-11-25 10:44:00 -08:00
Tanha	1f20a48a20	fix example app bug	2019-11-25 10:37:11 -08:00
Tanha	3a585c1f43	fix playing status bug in disk engine	2019-11-25 10:30:06 -08:00
Tanha	5ac5b93ac4	separate enum to another file	2019-11-24 23:27:51 -08:00
Tanha	b484f0bfb6	fix playing status when seeking	2019-11-24 23:24:25 -08:00
Tanha	0aeb8b0f88	change boolean playing status to enum	2019-11-21 01:46:42 -08:00
Tanha	8e7357860c	shouldnot be forcing play	2019-11-21 01:24:45 -08:00
Tanha	936de8c996	minor fix	2019-11-20 23:10:03 -08:00
Tanha	e986be9db5	clean up example app	2019-11-20 22:27:31 -08:00
Tanha	876d517f3d	Release 1.1.1	2019-11-20 22:15:51 -08:00
Tanha	0a12c68274	Fix fatal error when seeking on streamed audio	2019-11-20 22:15:32 -08:00
cendolinside123	873e537301	fix seek bar on example app's player (#9 )	2019-11-20 22:09:11 -08:00