Merge branch 'dev'

.github/workflows/swift.yml

@@ -14,10 +14,10 @@ jobs:
     name: Test iOS 
     runs-on: macOS-latest
     env: 
-      DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
+       DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=14.0,name=iPhone 11 Pro"] #, "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
+        destination: ["OS=latest,name=iPhone 13 Pro"]
     steps:
       - uses: actions/checkout@v2
       - name: iOS - ${{ matrix.destination }}

.gitignore

@@ -88,3 +88,5 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+.github/.DS_Store
+.DS_Store

AudioExample/AudioExample/AppCoordinator.swift

@@ -9,7 +9,6 @@
 import UIKit
 
 final class AppCoordinator {
-
     enum Route {
         case equalizer
     }
@@ -44,8 +43,8 @@ final class AppCoordinator {
 
     private func routeTo(_ route: AppCoordinator.Route) {
         switch route {
-            case .equalizer:
-                showEqualizerControls()
+        case .equalizer:
+            showEqualizerControls()
         }
     }
 

AudioExample/AudioExample/Controllers/EqualizerViewController.swift

@@ -9,7 +9,6 @@
 import UIKit
 
 class EqualizerViewController: UIViewController {
-
     private lazy var enableTextLabel = UILabel()
     private lazy var enableButton = UISwitch()
 
@@ -22,7 +21,8 @@ class EqualizerViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
-    required init?(coder: NSCoder) {
+    @available(*, unavailable)
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
@@ -69,7 +69,7 @@ class EqualizerViewController: UIViewController {
                 stackView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
                 stackView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
                 stackView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                stackView.heightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.heightAnchor, multiplier: 0.8)
+                stackView.heightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.heightAnchor, multiplier: 0.8),
             ]
         )
     }
@@ -86,7 +86,7 @@ class EqualizerViewController: UIViewController {
 
     private func buildSliders() -> [UIView] {
         var sliders = [UIView]()
-        for index in 0..<viewModel.numberOfBands() {
+        for index in 0 ..< viewModel.numberOfBands() {
             guard let item = viewModel.band(at: index) else { continue }
             let slider = buildSlider(item: item, index: index)
             sliders.append(slider)

AudioExample/AudioExample/Controllers/EqualizerViewModel.swift

@@ -16,7 +16,6 @@ struct EQBand {
 }
 
 final class EqualzerViewModel {
-
     private var bands: [EQBand] = []
 
     private let equalizerService: EqualizerService
@@ -31,7 +30,7 @@ final class EqualzerViewModel {
         bands = equalizerService.bands.map { item in
             var measurement = item.frequency
             var frequency = String(Int(measurement))
-            if item.frequency >= 1_000 {
+            if item.frequency >= 1000 {
                 measurement = item.frequency / 1000
                 frequency = "\(String(Int(measurement)))K"
             }
@@ -43,7 +42,7 @@ final class EqualzerViewModel {
         if enable {
             equalizerService.activate()
         } else {
-            equalizerService.deactive()
+            equalizerService.deactivate()
         }
     }
 

AudioExample/AudioExample/Controllers/PlayerControlsViewModel.swift

@@ -153,7 +153,7 @@ extension PlayerControlsViewModel: AudioPlayerServiceDelegate {
         updateContent?(.updateMetadata(""))
     }
 
-    func errorOccured(error _: AudioPlayerError) {}
+    func errorOccurred(error _: AudioPlayerError) {}
 
     func metadataReceived(metadata: [String: String]) {
         guard !metadata.isEmpty else { return }

AudioExample/AudioExample/Controllers/PlayerViewController.swift

@@ -51,7 +51,7 @@ class PlayerViewController: UIViewController {
                                                            style: .plain,
                                                            target: self,
                                                            action: #selector(showEqualizer))
-        
+
         tableView.translatesAutoresizingMaskIntoConstraints = false
         tableView.delegate = self
         tableView.dataSource = self
@@ -92,20 +92,21 @@ class PlayerViewController: UIViewController {
 
     @objc private func addNowPlaylistItem() {
         let controller = UIAlertController(title: "Add new item", message: "", preferredStyle: .alert)
-        controller.addTextField { (textField) in
+        controller.addTextField { textField in
             textField.placeholder = "Insert url here"
         }
-        let saveAction = UIAlertAction(title: "Save", style: .default) { [viewModel] action in
+        let saveAction = UIAlertAction(title: "Save", style: .default) { [viewModel] _ in
             if let textfield = controller.textFields?.first,
-               let text = textfield.text {
+               let text = textfield.text
+            {
                 viewModel.add(urlString: text)
             }
         }
         let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
 
         controller.addAction(saveAction)
         controller.addAction(cancelAction)
-        self.present(controller, animated: true, completion: nil)
+        present(controller, animated: true, completion: nil)
     }
 }
 
@@ -149,14 +150,13 @@ extension PlayerViewController: UITableViewDelegate {
     }
 }
 
-
 final class PlaylistTableViewCell: UITableViewCell {
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+    override init(style _: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
     }
 
     @available(*, unavailable)
-    required init?(coder: NSCoder) {
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 }

AudioExample/AudioExample/Controllers/PlayerViewModel.swift

@@ -18,14 +18,15 @@ final class PlayerViewModel {
     private let playerService: AudioPlayerService
     private let playlistItemsService: PlaylistItemsService
 
-    private let routeTo: ((AppCoordinator.Route) -> Void)
+    private let routeTo: (AppCoordinator.Route) -> Void
     private var currentPlayingItemIndex: Int?
 
     var reloadContent: ((ReloadAction) -> Void)?
 
     init(playlistItemsService: PlaylistItemsService,
          playerService: AudioPlayerService,
-         routeTo: @escaping (AppCoordinator.Route) -> Void) {
+         routeTo: @escaping (AppCoordinator.Route) -> Void)
+    {
         self.playlistItemsService = playlistItemsService
         self.playerService = playerService
         self.routeTo = routeTo
@@ -96,7 +97,7 @@ extension PlayerViewModel: AudioPlayerServiceDelegate {
         }
     }
 
-    func errorOccured(error _: AudioPlayerError) {
+    func errorOccurred(error _: AudioPlayerError) {
         currentPlayingItemIndex = nil
     }
 

AudioExample/AudioExample/Services/AudioPlayerService.swift

@@ -13,7 +13,7 @@ protocol AudioPlayerServiceDelegate: AnyObject {
     func didStartPlaying()
     func didStopPlaying()
     func statusChanged(status: AudioPlayerState)
-    func errorOccured(error: AudioPlayerError)
+    func errorOccurred(error: AudioPlayerError)
     func metadataReceived(metadata: [String: String])
 }
 
@@ -168,7 +168,7 @@ extension AudioPlayerService: AudioPlayerDelegate {
     }
 
     func audioPlayerUnexpectedError(player _: AudioPlayer, error: AudioPlayerError) {
-        delegate.invoke(invocation: { $0.errorOccured(error: error) })
+        delegate.invoke(invocation: { $0.errorOccurred(error: error) })
     }
 
     func audioPlayerDidCancel(player _: AudioPlayer, queuedItems _: [AudioEntryId]) {}

AudioExample/AudioExample/Services/EqualizerService.swift

@@ -10,7 +10,7 @@ import AVFoundation
 
 final class EqualizerService {
     private let playerService: AudioPlayerService
-    private let _freqs = [32, 64, 128, 250, 500, 1_000, 2_000, 4_000, 8_000, 16_000]
+    private let _freqs = [32, 64, 128, 250, 500, 1000, 2000, 4000, 8000, 16000]
     private let eqUnit: AVAudioUnitEQ
 
     var bands: [AVAudioUnitEQFilterParameters] {
@@ -23,7 +23,7 @@ final class EqualizerService {
         self.playerService = playerService
 
         eqUnit = AVAudioUnitEQ(numberOfBands: _freqs.count)
-        for i in 0..<_freqs.count {
+        for i in 0 ..< _freqs.count {
             eqUnit.bands[i].bypass = false
             eqUnit.bands[i].filterType = .parametric
             eqUnit.bands[i].frequency = Float(_freqs[i])
@@ -45,7 +45,7 @@ final class EqualizerService {
         playerService.add(eqUnit)
     }
 
-    func deactive() {
+    func deactivate() {
         isActivated = false
         playerService.remove(eqUnit)
     }

AudioExample/AudioExample/Services/NowPlayingCenter.swift

@@ -9,10 +9,9 @@
 import MediaPlayer
 
 final class NowPlayingCenter {
-
     private let infoCenter: MPNowPlayingInfoCenter
 
-    init(infoCenter: MPNowPlayingInfoCenter = .default()){
+    init(infoCenter: MPNowPlayingInfoCenter = .default()) {
         self.infoCenter = infoCenter
     }
 

AudioExample/AudioExample/Services/PlaylistItemsService.swift

@@ -80,7 +80,7 @@ final class PlaylistItemsService {
 func provideInitialPlaylistItems() -> [PlaylistItem] {
     let allCases = AudioContent.allCases
     let casesForQueueing: [AudioContent] = [.piano, .local, .khruangbin]
-    let allItems = allCases.map { PlaylistItem.init(content: $0 , queues: false) }
-    let casesForQueuingItems = casesForQueueing.map { PlaylistItem.init(content: $0 , queues: true) }
+    let allItems = allCases.map { PlaylistItem(content: $0, queues: false) }
+    let casesForQueuingItems = casesForQueueing.map { PlaylistItem(content: $0, queues: true) }
     return allItems + casesForQueuingItems
 }

AudioStreaming.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'AudioStreaming'
-  s.version = '0.4.0'
+  s.version = '0.9.0'
   s.license = 'MIT'
   s.summary = 'An AudioPlayer/Streaming library for iOS written in Swift using AVAudioEngine.'
   s.homepage = 'https://github.com/dimitris-c/AudioStreaming'

AudioStreaming.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		B59DF1A32493E90C0043C498 /* AudioFileStream+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59DF1A22493E90C0043C498 /* AudioFileStream+Helpers.swift */; };
 		B5AEDBB824744153007D8101 /* AudioStreaming.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5AEDBAE24744153007D8101 /* AudioStreaming.framework */; };
 		B5AEDBBF24744153007D8101 /* AudioStreaming.h in Headers */ = {isa = PBXBuildFile; fileRef = B5AEDBB124744153007D8101 /* AudioStreaming.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B5B36E432655A32200DC96F5 /* FrameFilterProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B36E422655A32200DC96F5 /* FrameFilterProcessor.swift */; };
 		B5B3B7CC248647ED00656828 /* AudioPlayerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B3B7CB248647ED00656828 /* AudioPlayerState.swift */; };
 		B5D4A40925D9321400E1450C /* IcycastHeaderParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A40825D9321400E1450C /* IcycastHeaderParser.swift */; };
 		B5D4A41025D948EF00E1450C /* IcycastHeadersProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A40B25D9445600E1450C /* IcycastHeadersProcessor.swift */; };
@@ -144,6 +145,7 @@
 		B5AEDBB224744153007D8101 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B5AEDBB724744153007D8101 /* AudioStreamingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AudioStreamingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5AEDBBE24744153007D8101 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B5B36E422655A32200DC96F5 /* FrameFilterProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameFilterProcessor.swift; sourceTree = "<group>"; };
 		B5B3B7CB248647ED00656828 /* AudioPlayerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerState.swift; sourceTree = "<group>"; };
 		B5D4A40825D9321400E1450C /* IcycastHeaderParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IcycastHeaderParser.swift; sourceTree = "<group>"; };
 		B5D4A40B25D9445600E1450C /* IcycastHeadersProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IcycastHeadersProcessor.swift; sourceTree = "<group>"; };
@@ -259,6 +261,7 @@
 		B55CEAC024855AA20001C498 /* Processors */ = {
 			isa = PBXGroup;
 			children = (
+				B5B36E422655A32200DC96F5 /* FrameFilterProcessor.swift */,
 				B5667A8F2499018D00D93F85 /* AudioFileStreamProcessor.swift */,
 				B5667B3D249BC43000D93F85 /* AudioPlayerRenderProcessor.swift */,
 				B55CE97024810DE20001C498 /* MetadataStreamProcessor.swift */,
@@ -615,6 +618,7 @@
 				B5667A902499018D00D93F85 /* AudioFileStreamProcessor.swift in Sources */,
 				B59D0B6F255C904900D6CCE5 /* FileAudioSource.swift in Sources */,
 				B5EF9555247E9393003E8FF8 /* AudioEntry.swift in Sources */,
+				B5B36E432655A32200DC96F5 /* FrameFilterProcessor.swift in Sources */,
 				B51FE0C02488F67C00F2A4D2 /* Queue.swift in Sources */,
 				B5667A922499063D00D93F85 /* AudioPlayerContext.swift in Sources */,
 				B55CE97124810DE20001C498 /* MetadataStreamProcessor.swift in Sources */,
@@ -794,6 +798,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -806,7 +811,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.0;
+				MARKETING_VERSION = 0.9.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioStreaming;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -824,6 +829,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -836,7 +842,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.0;
+				MARKETING_VERSION = 0.9.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioStreaming;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";