Release 3.0.0

add sleep timer feature
Co-Authored-By: Joe Williams <14778951+jw1540@users.noreply.github.com>
2021-03-10 14:37:13 -08:00 · 2021-03-10 14:25:43 -08:00 · 2021-03-10 14:25:43 -08:00 · 2021-03-10 14:05:58 -08:00 · 2021-03-10 12:59:02 -08:00 · 2021-03-10 12:59:02 -08:00
30 changed files with 745 additions and 135 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 */; };
+		A411CE4625F9609D0039E1CD /* SAPlayerFeatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = A411CE4525F9609D0039E1CD /* SAPlayerFeatures.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 */; };
@@ -96,6 +98,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>"; };
+		A411CE4525F9609D0039E1CD /* SAPlayerFeatures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayerFeatures.swift; sourceTree = "<group>"; };
 		A41AA0D1238BB9B600A467E1 /* SAPlayingStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPlayingStatus.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -273,6 +277,7 @@
 				A4681F872200DAD50018AB51 /* DirectorThreadSafeClosures.swift */,
 				A4681F892200DB3C0018AB51 /* Date.swift */,
 				A4681F962200E2E20018AB51 /* URL.swift */,
+				A40DBE282391D9C900F86146 /* Data.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -348,6 +353,7 @@
 			children = (
 				A4FBA6B3221B74C900D5A353 /* SALockScreenInfo.swift */,
 				A4681F8D2200E00E0018AB51 /* SAPlayer.swift */,
+				A411CE4525F9609D0039E1CD /* SAPlayerFeatures.swift */,
 				A4FBA6B6221BAC3D00D5A353 /* SAPlayerUpdateSubscription.swift */,
 				A4B4CC112223ED2A0045554B /* SAPlayerDownloader.swift */,
 				A4681F912200E1950018AB51 /* SAPlayerDelegate.swift */,
@@ -524,6 +530,7 @@
 				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 */,
@@ -549,6 +556,7 @@
 				A4681FCE220113A20018AB51 /* AudioConverter.swift in Sources */,
 				A4FBA6B9221BAF8700D5A353 /* SAAudioAvailabilityRange.swift in Sources */,
 				A4681FCD2201139E0018AB51 /* AudioStreamEngine.swift in Sources */,
+				A411CE4625F9609D0039E1CD /* SAPlayerFeatures.swift in Sources */,
 				A4681FD9220113CD0018AB51 /* AudioStreamWorker.swift in Sources */,
 				A4681FDF220113E20018AB51 /* DirectorThreadSafeClosures.swift in Sources */,
 				A4681FCB220113980018AB51 /* AudioEngine.swift in Sources */,
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -212,12 +212,12 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = R2392A68YQ;
+						DevelopmentTeam = H9Y26B6GZB;
 						LastSwiftMigration = 1120;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = R2392A68YQ;
+						DevelopmentTeam = H9Y26B6GZB;
 						LastSwiftMigration = 1120;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
@@ -475,11 +475,11 @@
 			baseConfigurationReference = 65A66AB4C3016E8BB53FF3E0 /* Pods-SwiftAudioPlayer_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = R2392A68YQ;
+				DEVELOPMENT_TEAM = H9Y26B6GZB;
 				INFOPLIST_FILE = SwiftAudioPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo-test.SwiftAudioPlayer-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -490,11 +490,11 @@
 			baseConfigurationReference = 4B5DD2AE0B23A759D18926DC /* Pods-SwiftAudioPlayer_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = R2392A68YQ;
+				DEVELOPMENT_TEAM = H9Y26B6GZB;
 				INFOPLIST_FILE = SwiftAudioPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo-test.SwiftAudioPlayer-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -504,7 +504,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BBD877782CC67FBCC7BF7532 /* Pods-SwiftAudioPlayer_Tests.debug.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = R2392A68YQ;
+				DEVELOPMENT_TEAM = H9Y26B6GZB;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -526,7 +526,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 0B7D1E6C00E83B4AF8AA1781 /* Pods-SwiftAudioPlayer_Tests.release.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = R2392A68YQ;
+				DEVELOPMENT_TEAM = H9Y26B6GZB;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -22,13 +20,13 @@
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                        <subviews>
                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lTK-Hd-Tl2">
-                                <rect key="frame" x="16" y="320" width="343" height="2"/>
+                                <rect key="frame" x="16" y="303" width="343" height="4"/>
                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <color key="progressTintColor" red="0.46202266219999999" green="0.83828371759999998" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <color key="trackTintColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                            </progressView>
                            <slider opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="w2a-RA-zmI">
-                                <rect key="frame" x="14" y="305" width="347" height="31"/>
+                                <rect key="frame" x="14" y="289" width="347" height="31"/>
                                <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>
@@ -37,41 +35,41 @@
                                    <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">
-                                <rect key="frame" x="172.5" y="250" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jUc-tP-CC5">
+                                <rect key="frame" x="172.5" y="233" width="30" height="30"/>
                                <state key="normal" title="play"/>
                                <connections>
                                    <action selector="playPauseTouched:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Avk-K3-EZ7"/>
                                </connections>
                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tFH-sY-Xu9">
-                                <rect key="frame" x="62.5" y="250" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tFH-sY-Xu9">
+                                <rect key="frame" x="62.5" y="233" width="30" height="30"/>
                                <state key="normal" title="-15"/>
                                <connections>
                                    <action selector="skipBackwardTouched:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="PCT-BE-udf"/>
                                </connections>
                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0QE-3F-a4G">
-                                <rect key="frame" x="282.5" y="250" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0QE-3F-a4G">
+                                <rect key="frame" x="282.5" y="233" width="30" height="30"/>
                                <state key="normal" title="+30"/>
                                <connections>
                                    <action selector="skipForwardTouched:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="uXv-bz-tnt"/>
                                </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="464" width="347" height="31"/>
+                                <rect key="frame" x="14" y="448" 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"/>
+                                <rect key="frame" x="14" y="381" 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"/>
+                                <rect key="frame" x="16" y="60" width="343" height="32"/>
                                <segments>
                                    <segment title="Soundbite"/>
                                    <segment title="Acquired"/>
@@ -81,46 +79,74 @@
                                    <action selector="audioSelected:" destination="vXZ-lx-hvc" eventType="valueChanged" id="oYE-yq-348"/>
                                </connections>
                            </segmentedControl>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KDu-ea-kF8">
-                                <rect key="frame" x="78" y="140" width="69" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KDu-ea-kF8">
+                                <rect key="frame" x="78" y="123" width="69" height="30"/>
                                <state key="normal" title="Download"/>
                                <connections>
                                    <action selector="downloadTouched:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="8Jg-1C-0Ms"/>
                                </connections>
                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6d9-Bc-hIz">
-                                <rect key="frame" x="244" y="140" width="49" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6d9-Bc-hIz">
+                                <rect key="frame" x="244" y="123" width="49" height="30"/>
                                <state key="normal" title="Stream"/>
                                <connections>
                                    <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.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"/>
+                                <rect key="frame" x="153" y="419" width="69" height="21"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j3w-gr-HzF">
-                                <rect key="frame" x="16" y="297" width="27" height="15"/>
+                                <rect key="frame" x="16" y="280" width="27" height="15"/>
                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Urj-Dv-41y">
-                                <rect key="frame" x="319" y="297" width="40" height="15"/>
+                                <rect key="frame" x="319" y="280" width="40" height="15"/>
                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="remote url: " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1IX-z5-wWx">
-                                <rect key="frame" x="16" y="207" width="343" height="16"/>
+                                <rect key="frame" x="16" y="190" width="343" height="16"/>
                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                <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"/>
+                                <rect key="frame" x="136.5" y="352" width="102" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Skip Silences" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M2y-FP-H1D">
+                                <rect key="frame" x="89" y="504" width="101" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2cn-E5-TeQ">
+                                <rect key="frame" x="226" y="499" width="49" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <connections>
+                                    <action selector="skipSilencesSwitched:" destination="vXZ-lx-hvc" eventType="valueChanged" id="p7X-Y8-7hO"/>
+                                </connections>
+                            </switch>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IGe-aU-Y6D">
+                                <rect key="frame" x="226" y="540" width="49" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <connections>
+                                    <action selector="sleepSwitched:" destination="vXZ-lx-hvc" eventType="valueChanged" id="noa-m8-VHy"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Sleep After 5 s" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vf6-kr-yWa">
+                                <rect key="frame" x="83" y="545" width="112" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <nil key="textColor"/>
                                <nil key="highlightedColor"/>
@@ -185,6 +211,8 @@
                        <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"/>
+                        <outlet property="skipSilencesSwitch" destination="2cn-E5-TeQ" id="TRI-IT-YJT"/>
+                        <outlet property="sleepSwitch" destination="IGe-aU-Y6D" id="BZn-9C-hOk"/>
                        <outlet property="streamButton" destination="6d9-Bc-hIz" id="DZe-ga-3RV"/>
                    </connections>
                </viewController>
@@ -59,7 +59,7 @@ class ViewController: UIViewController {
            self.currentUrlLocationLabel.text = "remote url: \(selectedAudio.url.absoluteString)"
        }
    }
-    
+    var freq:[Int] = [0,0,0,0,0,0,0,0,0,0]
    @IBOutlet weak var currentUrlLocationLabel: UILabel!
    @IBOutlet weak var bufferProgress: UIProgressView!
    @IBOutlet weak var scrubberSlider: UISlider!
@@ -103,10 +103,14 @@ class ViewController: UIViewController {
    override func viewDidLoad() {
        super.viewDidLoad()
        
+        SAPlayer.Downloader.allowUsingCellularData = true
+        
+        SAPlayer.shared.DEBUG_MODE = true
+        
        isPlayable = false
        selectedAudio = AudioInfo(index: 0)
        
-        addRandomModifiers()
+//        addRandomModifiers()
        
        _ = SAPlayer.Updates.Duration.subscribe { [weak self] (url, duration) in
            guard let self = self else { return }
@@ -117,7 +121,6 @@ class ViewController: UIViewController {
        
        _ = SAPlayer.Updates.ElapsedTime.subscribe { [weak self] (url, position) in
            guard let self = self else { return }
-            guard self.beingSeeked == false else { return }
            guard url == self.selectedAudio.url || url == self.savedUrls[self.selectedAudio] else { return }
            
            self.currentTimestampLabel.text = SAPlayer.prettifyTimestamp(position)
@@ -146,12 +149,12 @@ class ViewController: UIViewController {
            
            if self.duration == 0.0 { return }
            
-            let progress = Float((buffer.totalDurationBuffered + buffer.startingBufferTimePositon) / self.duration)
+            self.bufferProgress.progress = Float(buffer.bufferingProgress)
            
-            self.bufferProgress.progress = progress
-            
-            if progress >= 0.99 {
+            if buffer.bufferingProgress >= 0.99 {
                self.streamButton.isEnabled = false
+            } else {
+                self.streamButton.isEnabled = true
            }
            
            self.isPlayable = buffer.isReadyForPlaying
@@ -174,6 +177,10 @@ class ViewController: UIViewController {
                self.isPlayable = false
                self.playPauseButton.setTitle("Loading", for: .normal)
                return
+            case .ended:
+                self.isPlayable = false
+                self.playPauseButton.setTitle("Done", for: .normal)
+                return
            }
        }
    }
@@ -182,6 +189,16 @@ class ViewController: UIViewController {
        let node = AVAudioUnitReverb()
        SAPlayer.shared.audioModifiers.append(node)
        node.wetDryMix = 300
+        let frequency:[Int] = [60,170,310,600,1000,3000,6000,12000,14000,16000]
+        let node2 = AVAudioUnitEQ(numberOfBands:frequency.count)
+        node2.globalGain = 1
+        for i in 0...(node2.bands.count-1) {
+            node2.bands[i].frequency  = Float(frequency[i])
+            node2.bands[i].gain       = 0
+            node2.bands[i].bypass     = false
+            node2.bands[i].filterType = .parametric
+        }
+        SAPlayer.shared.audioModifiers.append(node2)
    }

    override func didReceiveMemoryWarning() {
@@ -212,10 +229,7 @@ class ViewController: UIViewController {
    @IBAction func rateChanged(_ sender: Any) {
        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)
-        }
+        SAPlayer.shared.rate = speed
    }
    @IBAction func reverbChanged(_ sender: Any) {
        let reverb = reverbSlider.value
@@ -241,7 +255,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
@@ -256,11 +270,15 @@ class ViewController: UIViewController {
    
    @IBAction func streamTouched(_ sender: Any) {
        if !isStreaming {
-            SAPlayer.shared.initializeRemoteAudio(withRemoteUrl: selectedAudio.url)
+            SAPlayer.shared.startRemoteAudio(withRemoteUrl: selectedAudio.url)
            streamButton.setTitle("Cancel streaming", for: .normal)
            downloadButton.isEnabled = false
+            isStreaming = true
        } else {
-            // TODO
+            SAPlayer.shared.stopStreamingRemoteAudio()
+            streamButton.setTitle("Stream", for: .normal)
+            downloadButton.isEnabled = true
+            isStreaming = false
        }
    }
    
@@ -275,6 +293,37 @@ class ViewController: UIViewController {
    @IBAction func skipForwardTouched(_ sender: Any) {
        SAPlayer.shared.skipForward()
    }
+    @IBAction func setEqualizerValue(_ sender: Any) {
+        if let slider = sender as? UISlider{
+            print("slider of index:", slider.tag, "is changed to", slider.value)
+            freq[slider.tag] = Int(slider.value)
+            print("current frequency : ",freq)
+            if let node = SAPlayer.shared.audioModifiers[2] as? AVAudioUnitEQ{
+                for i in 0...(node.bands.count - 1){
+                    node.bands[i].gain = Float(freq[i])
+                }
+            }
+        }
+        
+    }
    
+    @IBOutlet weak var skipSilencesSwitch: UISwitch!
+    
+    @IBAction func skipSilencesSwitched(_ sender: Any) {
+        if skipSilencesSwitch.isOn {
+            _ = SAPlayer.Features.SkipSilences.enable()
+        } else {
+            _ = SAPlayer.Features.SkipSilences.disable()
+        }
+    }
+    @IBOutlet weak var sleepSwitch: UISwitch!
+    
+    @IBAction func sleepSwitched(_ sender: Any) {
+        if sleepSwitch.isOn {
+            _ = SAPlayer.Features.SleepTimer.enable(afterDelay: 5.0)
+        } else {
+            _ = SAPlayer.Features.SleepTimer.disable()
+        }
+    }
 }

@@ -20,8 +20,8 @@ iOS 10.0 and higher.

 1. Clone repo
 2. CD to directory
-3. run `pod install` in terminal
-4. Run
+3. Run `pod install` in terminal
+4. Build and run

 ### Installation

@@ -34,12 +34,17 @@ pod 'SwiftAudioPlayer'

 ### Usage

+Import the player at the top:
+```swift
+import SwiftAudioPlayer
+```
+
 **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()
 ```

@@ -118,11 +123,15 @@ SwiftAudioPlayer is available under the MIT license. See the LICENSE file for mo

 Access the player and all of its fields and functions through `SAPlayer.shared`.

+### Supported file types
+
+Known supported file types are `.mp3` and `.wav`.
+
 ### Playing Audio (Basic Commands)

 To set up player with audio to play, use either: 
-* `initializeSavedAudio(withSavedUrl url: URL, mediaInfo: SALockScreenInfo?)` to play audio that is saved on the device.
-* `initializeRemoteAudio(withRemoteUrl url: URL, mediaInfo: SALockScreenInfo?)` to play audio streamed from a remote location.
+* `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. 

@@ -194,6 +203,12 @@ And use the following to stop any active or prevent future downloads of the corr
 func cancelDownload(withRemoteUrl url: URL)
 ```

+By default downloading will be allowed on cellular data. If you would like to turn this off set:
+```swift
+SAPlayer.Downloader.allowUsingCellularData = false
+```
+You can also retrieve what preference you have set for cellular downloads through `allowUsingCellularData`.
+
 ### Manage Downloaded

 Use the following to manage downloaded audio files.
@@ -252,7 +267,7 @@ Changes in the duration of the current initialized audio. Especially helpful for
 ### PlayingStatus
 Payload = `SAPlayingStatus`

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

 ### StreamingBuffer
 Payload = `SAAudioAvailabilityRange`
@@ -64,7 +64,7 @@ class AudioDiskEngine: AudioEngine {
            audioSampleRate = Float(audioFormat?.sampleRate ?? 44100)
            audioLengthSeconds = Float(audioLengthSamples) / audioSampleRate
            duration = Duration(audioLengthSeconds)
-            bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: 0, durationLoadedByNetwork: duration, isPlayable: true)
+            bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: 0, durationLoadedByNetwork: duration, predictedDurationToLoad: duration, isPlayable: true)
        } else {
            Log.monitor("Could not load downloaded file with url: \(url)")
        }
@@ -98,7 +98,7 @@ class AudioDiskEngine: AudioEngine {
            if state == .resumed {
                state = .suspended
            }
-            delegate?.didEndPlaying()
+            playingStatus = .ended
        }
        
        guard audioSampleRate != 0 else {
@@ -136,6 +136,7 @@ class AudioDiskEngine: AudioEngine {
    }
    
    override func invalidate() {
+        super.invalidate()
        //Nothing to invalidate for disk
    }
 }
@@ -27,6 +27,8 @@ import Foundation
 import AVFoundation

 protocol AudioEngineProtocol {
+    var key: Key { get }
+    var engine: AVAudioEngine { get set }
    func play()
    func pause()
    func seek(toNeedle needle: Needle)
@@ -40,9 +42,9 @@ protocol AudioEngineDelegate: AnyObject {

 class AudioEngine: AudioEngineProtocol {
    weak var delegate:AudioEngineDelegate?
-    let key:Key
+    var key:Key
    
-    let engine = AVAudioEngine()
+    var engine = AVAudioEngine()
    let playerNode = AVAudioPlayerNode()
    
    var timer: Timer?
@@ -77,12 +79,16 @@ class AudioEngine: AudioEngineProtocol {
                return
            }
            
+            if status == .ended {
+                delegate?.didEndPlaying()
+            }
+            
            AudioClockDirector.shared.audioPlayingStatusWasChanged(key, status: status)
        }
    }
    
-    var bufferedSecondsDebouncer: SAAudioAvailabilityRange = SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, isPlayable: false)
-    var bufferedSeconds: SAAudioAvailabilityRange =  SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, isPlayable: false) {
+    var bufferedSecondsDebouncer: SAAudioAvailabilityRange = SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, predictedDurationToLoad: Double.greatestFiniteMagnitude, isPlayable: false)
+    var bufferedSeconds: SAAudioAvailabilityRange =  SAAudioAvailabilityRange(startingNeedle: 0.0, durationLoadedByNetwork: 0.0, predictedDurationToLoad: Double.greatestFiniteMagnitude, isPlayable: false) {
        didSet {
            if bufferedSeconds.startingNeedle == 0.0 && bufferedSeconds.durationLoadedByNetwork == 0.0 {
                bufferedSecondsDebouncer = bufferedSeconds
@@ -149,7 +155,11 @@ class AudioEngine: AudioEngineProtocol {
    
    func updateIsPlaying() {
        if !bufferedSeconds.isPlayable {
-            playingStatus = .buffering
+            if bufferedSeconds.bufferingProgress > 0.999 {
+                playingStatus = .ended
+            } else {
+                playingStatus = .buffering
+            }
            return
        }
        
@@ -218,7 +218,7 @@ class AudioStreamEngine: AudioEngine {
        let range = converter.pollNetworkAudioAvailabilityRange()
        isPlayable = (numberOfBuffersScheduledInTotal >= MIN_BUFFERS_TO_BE_PLAYABLE && range.1 > 0) && predictedStreamDuration > 0
        Log.debug("loaded \(range), numberOfBuffersScheduledInTotal: \(numberOfBuffersScheduledInTotal), isPlayable: \(isPlayable)")
-        bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: range.0, durationLoadedByNetwork: range.1, isPlayable: isPlayable)
+        bufferedSeconds = SAAudioAvailabilityRange(startingNeedle: range.0, durationLoadedByNetwork: range.1, predictedDurationToLoad: predictedStreamDuration, isPlayable: isPlayable)
    }
    
    private func updateNeedle() {
@@ -236,12 +236,6 @@ class AudioStreamEngine: AudioEngine {
        var currentTime = TimeInterval(playerTime.sampleTime) / playerTime.sampleRate
        currentTime = currentTime > 0 ? currentTime : 0
        
-        if currentTime > predictedStreamDuration {
-            Log.info("reached end of audio")
-            seek(toNeedle: 0)
-            pause()
-            delegate?.didEndPlaying()
-        }
        needle = (currentTime + currentTimeOffset)
    }
    
@@ -296,7 +290,18 @@ class AudioStreamEngine: AudioEngine {
        updateNetworkBufferRange()
    }
    
+    override func pause() {
+        queue.async { [weak self] in
+            self?.pauseHelperDispatchQueue()
+        }
+    }
+    
+    private func pauseHelperDispatchQueue() {
+        super.pause()
+    }
+    
    override func invalidate() {
+        super.invalidate()
        converter.invalidate()
    }
 }
@@ -97,7 +97,15 @@ 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
+    
+    //This will be sent once at beginning of stream and every network seek
+    var totalBytesExpected: Int64? {
+        didSet {
+            if let bytes = totalBytesExpected {
+                delegate?.didUpdate(totalBytesExpected: Int64(byteOffsetBecauseOfSeek) + bytes)
+            }
+        }
+    }
    
    var largestPollingOffsetDifference: UInt64 = 1
    
@@ -110,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
@@ -152,30 +159,34 @@ class AudioThrottler: AudioThrottleable {
                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
            }
        }
@@ -57,28 +57,39 @@ public enum ConverterError: LocalizedError {
    public var errorDescription: String? {
        switch self {
        case .cannotLockQueue:
+            Log.warn("Failed to lock queue")
            return "Failed to lock queue"
        case .converterFailed(let status):
+            Log.warn(localizedDescriptionFromConverterError(status))
            return localizedDescriptionFromConverterError(status)
        case .failedToCreateDestinationFormat:
+            Log.warn("Failed to create a destination (processing) format")
            return "Failed to create a destination (processing) format"
        case .failedToCreatePCMBuffer:
+            Log.warn("Failed to create PCM buffer for reading data")
            return "Failed to create PCM buffer for reading data"
        case .notEnoughData:
+            Log.warn("Not enough data for read-conversion operation")
            return "Not enough data for read-conversion operation"
        case .parserMissingDataFormat:
+            Log.warn("Parser is missing a valid data format")
            return "Parser is missing a valid data format"
        case .reachedEndOfFile:
+            Log.warn("Reached the end of the file")
            return "Reached the end of the file"
        case .unableToCreateConverter(let status):
            return localizedDescriptionFromConverterError(status)
        case .superConcerningShouldNeverHappen:
+            Log.warn("Weird unexpected reader error. Should not have happened")
            return "Weird unexpected reader error. Should not have happened"
        case .cannotCreatePCMBufferWithoutConverter:
+            Log.debug("Could not create a PCM Buffer because reader does not have a converter yet")
            return "Could not create a PCM Buffer because reader does not have a converter yet"
        case .throttleParsingBuffersForEngine:
+            Log.warn("Preventing the reader from creating more PCM buffers since the player has more than 60 seconds of audio already to play")
            return "Preventing the reader from creating more PCM buffers since the player has more than 60 seconds of audio already to play"
        case .failedToCreateParser:
+            Log.warn("Could not create a parser")
            return "Could not create a parser"
        }
    }
@@ -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)
        }
        
@@ -111,10 +113,13 @@ class AudioParser: AudioParsable {
        didSet {
            if let audioPacketByteSize = audioPackets.last?.0?.mDataByteSize {
                sumOfParsedAudioBytes += audioPacketByteSize
-                numberOfPacketsParsed += 1
+            } else if let audioPacketByteSize = audioPackets.last?.1.count { // for uncompressed audio there are no descriptors to say how many bytes of audio are in this packet so we approximate by data size
+                sumOfParsedAudioBytes += UInt32(audioPacketByteSize)
            }
            
-            //TODO: duration will not work with WAV or AIFF
+            numberOfPacketsParsed += 1
+            
+            //TODO: duration will not be accurate with WAV or AIFF
        }
    }
    
@@ -202,7 +207,7 @@ class AudioParser: AudioParsable {
    private func getOffset(fromPacketIndex index: AVAudioPacketCount) -> UInt64? {
        //Clear current buffer if we have audio format
        guard fileAudioFormat != nil, let bytesPerPacket = self.averageBytesPerPacket else {
-            Log.error("should not get here")
+            Log.error("should not get here \(String(describing: fileAudioFormat)) and \(String(describing: self.averageBytesPerPacket))")
            return nil
        }
        
@@ -295,7 +300,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)
@@ -3,7 +3,7 @@
 //  SwiftAudioPlayer
 //
 //  Created by Tanha Kabir on 2019-01-29.
-//  Copyright © 2019 Tanha Kabir, Jon Mercer
+//  Copyright © 2019 Tanha Kabir, Jon Mercer, Moy Inzunza
 //
 //  This file was modified and adapted from https://github.com/syedhali/AudioStreamer
 //  which was released under Apache License 2.0. Apache License 2.0 requires explicit
@@ -32,15 +32,23 @@
 import Foundation
 import AVFoundation

-func ParserPacketListener(_ context: UnsafeMutableRawPointer, _ byteCount: UInt32, _ packetCount: UInt32, _ streamData: UnsafeRawPointer, _ packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>) {
+#if swift(>=5.3)
+func ParserPacketListener (_ context: UnsafeMutableRawPointer, _ byteCount: UInt32, _ packetCount: UInt32, _ streamData: UnsafeRawPointer, _ packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?) {
+    parserPacket(context, byteCount, packetCount, streamData, packetDescriptions)
+}
+
+#else
+func ParserPacketListener (_ context: UnsafeMutableRawPointer, _ byteCount: UInt32, _ packetCount: UInt32, _ streamData: UnsafeRawPointer, _ packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>) {
+    parserPacket(context, byteCount, packetCount, streamData, packetDescriptions)
+}
+#endif
+
+func parserPacket(_ context: UnsafeMutableRawPointer, _ byteCount: UInt32, _ packetCount: UInt32, _ streamData: UnsafeRawPointer, _ packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?){
+    
    let selfAudioParser = Unmanaged<AudioParser>.fromOpaque(context).takeUnretainedValue()
    
-    //bug in core audio where this could be nil
-    let packetDescriptionOrNil: UnsafeMutablePointer<AudioStreamPacketDescription>? = packetDescriptions
-    let isCompressed = packetDescriptionOrNil != nil
-    
    guard let fileAudioFormat = selfAudioParser.fileAudioFormat else {
-        Log.monitor("shouldnot have reached packet listener without a data format")
+        Log.monitor("should not have reached packet listener without a data format")
        return
    }
    
@@ -50,15 +58,17 @@ func ParserPacketListener(_ context: UnsafeMutableRawPointer, _ byteCount: UInt3
    }
    
    //TODO refactor this after we get it working
-    if isCompressed {
+    if let compressedPacketDescriptions = packetDescriptions {  // is compressed audio (.mp3)
+        Log.debug("compressed audio")
        for i in 0 ..< Int(packetCount) {
-            let audioPacketDescription = packetDescriptions[i]
+            let audioPacketDescription = compressedPacketDescriptions[i]
            let audioPacketStart = Int(audioPacketDescription.mStartOffset)
            let audioPacketSize = Int(audioPacketDescription.mDataByteSize)
            let audioPacketData = Data(bytes: streamData.advanced(by: audioPacketStart), count: audioPacketSize)
            selfAudioParser.audioPackets.append((audioPacketDescription,audioPacketData))
        }
-    } else {
+    } else { // not compressed audio (.wav)
+        Log.debug("uncompressed audio")
        let format = fileAudioFormat.streamDescription.pointee
        let bytesPerAudioPacket = Int(format.mBytesPerPacket)
        for i in 0 ..< Int(packetCount) {
@@ -68,4 +78,5 @@ func ParserPacketListener(_ context: UnsafeMutableRawPointer, _ byteCount: UInt3
            selfAudioParser.audioPackets.append((nil, audioPacketData))
        }
    }
+    
 }
@@ -29,8 +29,15 @@ import Foundation
 public struct SAAudioAvailabilityRange {
    let startingNeedle: Needle
    let durationLoadedByNetwork: Duration
+    let predictedDurationToLoad: Duration
    let isPlayable: Bool
    
+    public var bufferingProgress: Double {
+        get {
+            return (startingNeedle + durationLoadedByNetwork) / predictedDurationToLoad
+        }
+    }
+    
    public var startingBufferTimePositon: Double {
        get {
            return startingNeedle
@@ -52,4 +59,8 @@ public struct SAAudioAvailabilityRange {
    public func contains(_ needle: Double) -> Bool {
        return needle >= startingNeedle && (needle - startingNeedle) < durationLoadedByNetwork
    }
+    
+    public func isCompletelyBuffered() -> Bool {
+        return startingNeedle + durationLoadedByNetwork >= predictedDurationToLoad
+    }
 }
@@ -30,4 +30,5 @@ public enum SAPlayingStatus {
    case playing
    case paused
    case buffering
+    case ended
 }
@@ -35,6 +35,10 @@ protocol LockScreenViewProtocol {
 }

 extension LockScreenViewProtocol {
+    func clearLockScreenInfo() {
+         MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
+    }
+    
    @available(iOS 10.0, *)
    func setLockScreenInfo(withMediaInfo info: SALockScreenInfo?, duration: Duration) {
        var nowPlayingInfo:[String : Any] = [:]
@@ -32,6 +32,7 @@ protocol AudioDataManagable {
    var allowCellular: Bool { get set }
    
    func setBackgroundCompletionHandler(_ completionHandler: @escaping () -> ())
+    func setAllowCellularDownloadPreference(_ preference: Bool)
    
    func clear()
    
@@ -51,7 +52,7 @@ protocol AudioDataManagable {
 }

 class AudioDataManager: AudioDataManagable {
-    var allowCellular: Bool = false
+    var allowCellular: Bool = true
    
    static let shared: AudioDataManagable = AudioDataManager()
    
@@ -99,6 +100,10 @@ class AudioDataManager: AudioDataManagable {
        backgroundCompletion = completionHandler
    }
    
+    func setAllowCellularDownloadPreference(_ preference: Bool) {
+        allowCellular = preference
+    }
+    
    func attach(callback: @escaping (_ id: ID, _ progress: Double)->()) {
        globalDownloadProgressCallback = callback
    }
@@ -103,12 +103,15 @@ extension FileStorage {
        }
        
        static func locate(_ id: ID) -> URL? {
-            let urls = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
-            
-            for url in urls {
-                if url.absoluteString.contains(id) && url.pathExtension != "" {
-                    _ = getUrl(givenId: id, andFileExtension: url.pathExtension)
-                    return url
+            let folderUrls = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+            guard folderUrls.count != 0 else { return nil }
+
+            if let urls = try? FileManager.default.contentsOfDirectory(at: folderUrls[0], includingPropertiesForKeys: nil) {
+                for url in urls {
+                    if url.absoluteString.contains(id) && url.pathExtension != "" {
+                        _ = getUrl(givenId: id, andFileExtension: url.pathExtension)
+                        return url
+                    }
                }
            }
            return nil
@@ -243,15 +243,19 @@ extension AudioStreamWorker: URLSessionDataDelegate {
        }
        
        guard self.task == dataTask else {
-            Log.error("stream_error not the same task") //Probably because of seek
+            Log.error("stream_error not the same task 638283") //Probably because of seek
            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)
        
@@ -267,7 +271,7 @@ extension AudioStreamWorker: URLSessionDataDelegate {
        }
        
        guard self.task == dataTask else {
-            Log.error("stream_error not the same task")
+            Log.error("stream_error not the same task 517253")
            return
        }
        
@@ -289,8 +293,8 @@ extension AudioStreamWorker: URLSessionDataDelegate {
            return
        }
        
-        guard self.task == task else {
-            Log.error("stream_error not the same task")
+        if self.task != task && self.task != nil {
+            Log.error("stream_error not the same task 3901833")
            return
        }
        
@@ -27,6 +27,16 @@ import Foundation
 import AVFoundation

 public class SAPlayer {
+    public var DEBUG_MODE: Bool = false {
+        didSet {
+            if(DEBUG_MODE) {
+                logLevel = LogLevel.EXTERNAL_DEBUG
+            } else {
+                logLevel = LogLevel.MONITOR
+            }
+        }
+    }
+    
    /**
     Access to the player.
     */
@@ -35,6 +45,77 @@ public class SAPlayer {
    private var presenter: SAPlayerPresenter!
    private var player: AudioEngine?
    
+    /**
+    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
+        }
+    }
+    
+    /**
+    Unique ID for the current engine. This will be nil if no audio has been initialized which means no engine exists.
+    */
+    public var engineUID: String? {
+        get {
+            return player?.key
+        }
+    }
+    
+    /**
+    Access the player node of the engine. Node is nil if player has not been initialized with audio.
+     
+     - Important: Changes to the engine and this node are not safe guarded, thus unknown behaviour can arise from changing the engine or this node. Just be wary and read [documentation of AVAudioEngine](https://developer.apple.com/documentation/avfoundation/avaudioengine) well when modifying,
+    */
+    public var playerNode: AVAudioPlayerNode? {
+        get {
+            return player?.playerNode
+        }
+    }
+    
+    /**
+    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 rate of audio playback. This rate assumes use of the default rate modifier at the first index of `audioModifiers`; if you removed that modifier than this will be nil. If no audio has been initialized then this will also be nil.
+    */
+    public var rate: Float? {
+        get {
+            return (audioModifiers.first as? AVAudioUnitTimePitch)?.rate
+        }
+        
+        set {
+            guard let value = newValue else { return }
+            guard let node = audioModifiers.first as? AVAudioUnitTimePitch else { return }
+            
+            node.rate = value
+            playbackRateOfAudioChanged(rate: value)
+            
+            // if skip silences was on, reset it to have the new rate
+            // TODO fix this to rate being broadcasted and handled in only Features.SkipSilences https://github.com/tanhakabir/SwiftAudioPlayer/issues/77
+//            if Features.SkipSilences.enabled && !(value == rate ?? 1.0 - 0.5 || value == rate ?? 1.0 + 0.5) {
+//                _ = Features.SkipSilences.disable()
+//                _ = Features.SkipSilences.enable()
+//            }
+        }
+    }
+    
    /**
     Corresponding to the skipping forward button on the media player on the lockscreen. Default is set to 30 seconds.
     */
@@ -72,11 +153,17 @@ public class SAPlayer {
         }
         ````
         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.
+     
+     For more details on pitch modifiers for playback rate changes please look at [developer.apple.com/forums/thread/6050](https://developer.apple.com/forums/thread/6050).
+     
+     To remove this default pitch modifier for playback rate changes, remove the node by calling `SAPlayer.shared.clearAudioModifiers()`.
     */
    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 {
@@ -142,6 +229,22 @@ public class SAPlayer {
        audioModifiers.append(AVAudioUnitTimePitch(audioComponentDescription: componentDescription))
    }
    
+    /**
+     Clears all [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements) modifiers intended to be used for realtime audio manipulation.
+     */
+    public func clearAudioModifiers() {
+        audioModifiers.removeAll()
+    }
+    
+    /**
+     Append an [AVAudioUnit](https://developer.apple.com/documentation/avfoundation/audio_track_engineering/audio_engine_building_blocks/audio_enhancements) modifier to the list of modifiers used for realtime audio manipulation. The modifier will be added to the end of the list.
+
+     - Parameter modifier: The modifier to append.
+     */
+    public func addAudioModifier(_ modifer: AVAudioUnit) {
+        audioModifiers.append(modifer)
+    }
+    
    /**
     Formats a textual representation of a given timestamp for display in hh:MM:SS format, that is hours:minutes:seconds.

@@ -169,21 +272,27 @@ public class SAPlayer {
 //MARK: - External Player Controls
 extension SAPlayer {
    /**
-     Toggles between the play and pause state of the player if the player is not buffering (thus is playable).
+     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 even if nothing playable is loaded (aka still in buffering state or no audio is initialized).
+     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 even if nothing playable is loaded (aka still in buffering state or no audio is initialized).
+     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()
@@ -221,6 +330,23 @@ extension SAPlayer {
    /**
     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.
     
+     - Note: By default this engine has added a pitch modifier node to change the pitch so that on playback rate changes of spoken word the pitch isn't shifted.
+     
+     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.
+     
+     For more details on pitch modifiers for playback rate changes please look at [developer.apple.com/forums/thread/6050](https://developer.apple.com/forums/thread/6050).
+     
     - Parameter rate: The current rate at which the audio is playing.
     */
    public func playbackRateOfAudioChanged(rate: Float) {
@@ -232,28 +358,86 @@ extension SAPlayer {
     
     - 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: 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.
+     
+     To remove this default pitch modifier for playback rate changes, remove the node by calling `SAPlayer.shared.clearAudioModifiers()`.
+     
     - 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)
    }
    
    /**
-     Sets up player to play audio that will be streamed from a remote location.
+     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: 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.
+     
+     To remove this default pitch modifier for playback rate changes, remove the node by calling `SAPlayer.shared.clearAudioModifiers()`.
+     
     - 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)
    }
+    
+    public func stopStreamingRemoteAudio() {
+        presenter.handleStopStreamingAudio()
+    }
+    
+    /**
+     Resets the player to the state before initializing audio and setting media info.
+     */
+    public func clear() {
+        player = nil
+        presenter.handleClear()
+    }
 }


@@ -271,6 +455,12 @@ extension SAPlayer: SAPlayerDelegate {
        player = AudioStreamEngine(withRemoteUrl: url, delegate: presenter)
    }
    
+    func clearEngine() {
+        player?.pause()
+        player?.invalidate()
+        player = nil
+    }
+    
    func playEngine() {
        becomeDeviceAudioPlayer()
        player?.play()
@@ -32,6 +32,7 @@ protocol SAPlayerDelegate: AnyObject, LockScreenViewProtocol {
    
    func startAudioDownloaded(withSavedUrl url: AudioURL)
    func startAudioStreamed(withRemoteUrl url: AudioURL)
+    func clearEngine()
    func playEngine()
    func pauseEngine()
    func seekEngine(toNeedle needle: Needle) //TODO ensure that engine cleans up out of bounds
@@ -100,5 +100,14 @@ extension SAPlayer {
        public static func setBackgroundCompletionHandler(_ completionHandler: @escaping () -> ()) {
            AudioDataManager.shared.setBackgroundCompletionHandler(completionHandler)
        }
+        
+        /**
+         Whether downloading audio on cellular data is allowed. By default this is set to `true`.
+         */
+        public static var allowUsingCellularData = true {
+            didSet {
+                AudioDataManager.shared.setAllowCellularDownloadPreference(allowUsingCellularData)
+            }
+        }
    }
 }
@@ -0,0 +1,121 @@
+//
+//  SAPlayerFeature.swift
+//  SwiftAudioPlayer
+//
+//  Created by Tanha Kabir on 3/10/21.
+//
+
+import Foundation
+import AVFoundation
+
+extension SAPlayer {
+    /**
+     Special features for audio manipulation. These are examples of manipulations you can do with the player outside of this library. This is just an aggregation of community contibuted ones.
+     
+     - Note: These features assume default state of the player and `audioModifiers` meaning some expect the first audio modifier to be the default `AVAudioUnitTimePitch` that comes with the SAPlayer.
+     */
+    public struct Features {
+        
+        /**
+         Feature to skip silences in spoken word audio. The player will speed up the rate of audio playback when silence is detected.
+         
+         - Important: The first audio modifier must be the default `AVAudioUnitTimePitch` that comes with the SAPlayer for this feature to work.
+         */
+        public struct SkipSilences {
+            
+            static var enabled: Bool = false
+            
+            /**
+             Enable feature to skip silences in spoken word audio. The player will speed up the rate of audio playback when silence is detected. This can be called at any point of audio playback.
+             
+             - Important: The first audio modifier must be the default `AVAudioUnitTimePitch` that comes with the SAPlayer for this feature to work.
+             */
+            public static func enable() -> Bool {
+                guard let engine = SAPlayer.shared.engine else { return false }
+                
+                Log.info("enabling skip silences feature")
+                enabled = true
+                let originalRate = SAPlayer.shared.rate ?? 1.0
+                let format = engine.mainMixerNode.outputFormat(forBus: 0)
+                
+                engine.mainMixerNode.installTap(onBus: 0, bufferSize: 1024, format: format) { buffer, when in
+                    guard let channelData = buffer.floatChannelData else {
+                        return
+                    }
+
+                    let channelDataValue = channelData.pointee
+                    let channelDataValueArray = stride(from: 0,
+                                                       to: Int(buffer.frameLength),
+                                                       by: buffer.stride).map { channelDataValue[$0] }
+
+                    let rms = sqrt(channelDataValueArray.map { $0 * $0 }.reduce(0, +) / Float(buffer.frameLength))
+
+                    let avgPower = 20 * log10(rms)
+
+                    let meterLevel = self.scaledPower(power: avgPower)
+                    Log.debug("meterLevel: \(meterLevel)")
+                    if meterLevel < 0.6 {
+                        SAPlayer.shared.rate = originalRate + 0.5
+                        Log.test("speed up rate to \(String(describing: SAPlayer.shared.rate))")
+                    } else {
+                        SAPlayer.shared.rate = originalRate
+                        Log.test("slow down rate to \(String(describing: SAPlayer.shared.rate))")
+                    }
+                }
+                
+                return true
+            }
+            
+            /**
+             Disable feature to skip silences in spoken word audio. The player will speed up the rate of audio playback when silence is detected. This can be called at any point of audio playback.
+             
+             - Important: The first audio modifier must be the default `AVAudioUnitTimePitch` that comes with the SAPlayer for this feature to work.
+             */
+            public static func disable() -> Bool {
+                // TODO fix disabling on speed up portion and being stuck at faster speed https://github.com/tanhakabir/SwiftAudioPlayer/issues/76
+                guard let engine = SAPlayer.shared.engine else { return false }
+                Log.info("disabling skip silences feature")
+                engine.mainMixerNode.removeTap(onBus: 0)
+                enabled = false
+                return true
+            }
+            
+            private static func scaledPower(power: Float) -> Float {
+                guard power.isFinite else { return 0.0 }
+                let minDb: Float = -80.0
+                if power < minDb {
+                    return 0.0
+                } else if power >= 1.0 {
+                    return 1.0
+                } else {
+                    return (abs(minDb) - abs(power)) / abs(minDb)
+                }
+            }
+        }
+        
+        /**
+         Feature to pause the player after a delay. This will happen regardless of if another audio clip has started.
+         */
+        public struct SleepTimer {
+            static var timer: Timer?
+            
+            /**
+             Enable feature to pause the player after a delay. This will happen regardless of if another audio clip has started.
+             
+             - Parameter afterDelay: The number of seconds to wait before pausing the audio
+             */
+            public static func enable(afterDelay delay: Double) {
+                timer = Timer.scheduledTimer(withTimeInterval: delay, repeats: false, block: { _ in
+                    SAPlayer.shared.pause()
+                })
+            }
+            
+            /**
+             Disable feature to pause the player after a delay. 
+             */
+            public static func disable() {
+                timer?.invalidate()
+            }
+        }
+    }
+}
@@ -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)
@@ -71,9 +83,7 @@ class SAPlayerPresenter {
    }
    
    private func attachForUpdates(url: URL) {
-        AudioClockDirector.shared.detachFromChangesInDuration(withID: durationRef)
-        AudioClockDirector.shared.detachFromChangesInNeedle(withID: needleRef)
-        AudioClockDirector.shared.detachFromChangesInPlayingStatus(withID: playingStatusRef)
+        detachFromUpdates()
        
        self.key = url.key
        urlKeyMap[url.key] = url
@@ -113,6 +123,17 @@ class SAPlayerPresenter {
        })
    }
    
+    private func detachFromUpdates() {
+        AudioClockDirector.shared.detachFromChangesInDuration(withID: durationRef)
+        AudioClockDirector.shared.detachFromChangesInNeedle(withID: needleRef)
+        AudioClockDirector.shared.detachFromChangesInPlayingStatus(withID: playingStatusRef)
+    }
+    
+    func handleStopStreamingAudio() {
+        delegate?.clearEngine()
+        detachFromUpdates()
+    }
+    
    @available(iOS 10.0, *)
    func handleLockscreenInfo(info: SALockScreenInfo?) {
        self.mediaInfo = info
@@ -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.
@@ -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)
+        }
+    }
+}
@@ -9,22 +9,23 @@
 import Foundation
 import os.log

+// Possible levels of log messages to log
+enum LogLevel: Int {
+    case DEBUG = 1
+    case INFO = 2
+    case WARN = 3
+    case ERROR = 4
+    case EXTERNAL_DEBUG = 5
+    case MONITOR = 6
+    case TEST = 7
+}
+
+// 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.
+var logLevel: LogLevel = LogLevel.MONITOR
+
 class Log {
    private init() {}
    
-    // Possible levels of log messages to log
-    public enum LogLevel: Int {
-        case DEBUG = 1
-        case INFO = 2
-        case WARN = 3
-        case ERROR = 4
-        case MONITOR = 5
-        case TEST = 6
-    }
-    
-    // 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.MONITOR
-    
    // Used for OSLog
    private static let SUBSYSTEM: String = "com.SwiftAudioPlayer"
    
@@ -68,6 +69,11 @@ class Log {
            let log = OSLog(subsystem: SUBSYSTEM, category: "ERROR 🛑🛑🛑🛑")
            os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
        }
+        
+        if logLevel.rawValue <= LogLevel.EXTERNAL_DEBUG.rawValue {
+            let log = OSLog(subsystem: SUBSYSTEM, category: "WARNING")
+            os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
+        }
    }
    
    /**
@@ -86,7 +92,7 @@ class Log {
    public static func monitor(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
        let fileName = URLUtil.getNameFromStringPath(classPath)
        if logLevel.rawValue <= LogLevel.ERROR.rawValue {
-            let log = OSLog(subsystem: SUBSYSTEM, category: "MONITOR 🔥🔥🔥🔥")
+            let log = OSLog(subsystem: SUBSYSTEM, category: "ERROR 🔥🔥🔥🔥")
            os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
        }
    }
@@ -110,6 +116,11 @@ class Log {
            let log = OSLog(subsystem: SUBSYSTEM, category: "WARN  ⚠️⚠️⚠️⚠️")
            os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
        }
+        
+        if logLevel.rawValue <= LogLevel.EXTERNAL_DEBUG.rawValue {
+            let log = OSLog(subsystem: SUBSYSTEM, category: "DEBUG")
+            os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
+        }
    }
    
    /**
@@ -8,7 +8,7 @@

 Pod::Spec.new do |s|
  s.name             = 'SwiftAudioPlayer'
-  s.version          = '2.1.0'
+  s.version          = '3.0.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.
Author	SHA1	Message	Date
tanhakabir	9b375b99dc	Release 3.0.0	2021-03-10 14:37:13 -08:00
tanhakabir	ee80976e92	add sleep timer feature Co-Authored-By: Joe Williams <14778951+jw1540@users.noreply.github.com>	2021-03-10 14:25:43 -08:00
tanhakabir	10aea39cae	expose ID for current player	2021-03-10 14:25:43 -08:00
tanhakabir	431fdc6428	add rate as a core property of SAPlayer (#78 )	2021-03-10 14:05:58 -08:00
tanhakabir	eda60a3c3d	remove random audio modifiers to see skip silences in work	2021-03-10 12:59:02 -08:00
tanhakabir	d7b90f1f58	use Joe's original rate for speeding through silences Co-Authored-By: Joe Williams <14778951+jw1540@users.noreply.github.com>	2021-03-10 12:59:02 -08:00
tanhakabir	08b30307aa	Add PR from Joe for skipping silences Co-Authored-By: Joe Williams <14778951+jw1540@users.noreply.github.com>	2021-03-10 12:59:02 -08:00
tanhakabir	751ca765d5	Release 2.13.0	2021-03-06 19:51:39 -08:00
tanhakabir	68ea5a9468	fix crash on uncompressed audio (#69 )	2021-03-06 19:50:18 -08:00
tanhakabir	46ab845c8e	Release 2.12.0	2021-02-22 22:47:40 -08:00
tanhakabir	b597704115	Fix locating files in downloads Co-Authored-By: fayinsky <38639193+fayinsky@users.noreply.github.com>	2021-02-22 22:42:27 -08:00
tanhakabir	889e2257ab	Add documentation for supported file types (#63 )	2021-02-22 22:37:26 -08:00
tanhakabir	e962008b4c	Fix freezing on seek (#62 )	2021-02-22 22:32:54 -08:00
tanhakabir	d6c1d13d7d	create API for setting preference for downloading on cellular data (#61 ) * set cellular downloads to true to allow for simulator downloads * add documentation	2021-02-22 22:13:36 -08:00
tanhakabir	922a794d09	remove noisey logs	2021-02-22 21:48:34 -08:00
tanhakabir	96092a208c	Add files per Xcode 9.3	2021-02-22 17:37:07 -08:00
tanhakabir	b71729035d	Open up access to playerNode (#60 )	2021-02-22 17:34:59 -08:00
tanhakabir	2abba6f0cc	Release 2.11.0	2020-10-22 12:22:20 -07:00
tanhakabir	f081b7549d	add endpoint to remove default pitch modifier (#51 )	2020-10-22 11:59:01 -07:00
tanhakabir	55fbae7b4a	Update README to include module name for import (#47 )	2020-09-19 16:02:46 -07:00
tanhakabir	2acbde2efa	Release 2.10.0	2020-09-19 15:52:25 -07:00
Moises Inzunza	acbdf05d4f	Fixed bug in swift 5.3 (#46 )	2020-09-19 12:19:50 -07:00
Tanha	c325caa914	Release 2.9.0	2020-03-06 23:53:42 -08:00
tanhakabir	dd54d81573	implement streaming cancellation (#32 ) * cancels streaming initally, but player enters weird state trying to stream again * calling superclass invalidate from engines for good measure * Fix UI to fix seemingly weird state * Fix error warning	2020-03-06 23:52:22 -08:00
tanhakabir	ebc282d5c2	fix crash on cancel streaming pressed (#30 )	2020-03-06 23:28:30 -08:00
Tanha	80ce253f92	Release 2.8.2	2020-01-21 00:29:28 -08:00
tanhakabir	fe2395066f	Add equalizer example (#28 ) * project configure for me * to see log * set project * new UI * fix ui * re-fix UI * add example of equalizer * Revert "re-fix UI" This reverts commit `05ed993a52`. * Revert "fix ui" This reverts commit `0da9f6adea`. * Revert "new UI" This reverts commit `ffd6a95a2d`. * Add verbose debug mode to player Co-authored-by: cendolinside123 <jnsbstn391@gmail.com>	2020-01-21 00:27:51 -08:00
Tanha	3e66b4b4d4	Release 2.8.1	2020-01-04 13:35:29 -08:00
Tanha	58bbc97a1b	Minor fix on end of audio notification	2020-01-04 13:35:03 -08:00
Tanha	8d9e9d92f4	Release 2.8.0	2020-01-04 13:24:47 -08:00
tanhakabir	03392c21e0	fix bug in notification of end of audio in PlayingStatus (#25 )	2020-01-04 13:23:50 -08:00
Tanha	924170d159	Release 2.7.0	2020-01-04 02:04:35 -08:00
tanhakabir	b355eb4e09	add api for buffer progress in SAAvailabilityRange (#24 )	2020-01-04 02:02:56 -08:00
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