version bump 1.2.3

Also fixes a thread safety issue

AudioPlayer/AudioPlayer.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		9816A8BB2BC87BC200AD1299 /* AudioPlayerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9816A8BA2BC87BC200AD1299 /* AudioPlayerService.swift */; };
 		984DE9552BDAE59C004B427A /* Notifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 984DE9542BDAE59C004B427A /* Notifier.swift */; };
 		984DE9572BDAFC7E004B427A /* AudioPlayerControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 984DE9562BDAFC7E004B427A /* AudioPlayerControlsView.swift */; };
+		989E08E72BF7A4E300599F17 /* PrefersTabNavigationEnvironmentKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989E08E62BF7A4E300599F17 /* PrefersTabNavigationEnvironmentKey.swift */; };
 		98BFB41A2BC97AF800E812C0 /* DisplayLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BFB4192BC97AF800E812C0 /* DisplayLink.swift */; };
 		98BFB41D2BCD7BB800E812C0 /* EqualizerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BFB41C2BCD7BB800E812C0 /* EqualizerView.swift */; };
 		98BFB41F2BCD814000E812C0 /* EqualizerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BFB41E2BCD814000E812C0 /* EqualizerService.swift */; };
@@ -63,6 +64,7 @@
 		9816A8BA2BC87BC200AD1299 /* AudioPlayerService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerService.swift; sourceTree = "<group>"; };
 		984DE9542BDAE59C004B427A /* Notifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifier.swift; sourceTree = "<group>"; };
 		984DE9562BDAFC7E004B427A /* AudioPlayerControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerControlsView.swift; sourceTree = "<group>"; };
+		989E08E62BF7A4E300599F17 /* PrefersTabNavigationEnvironmentKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefersTabNavigationEnvironmentKey.swift; sourceTree = "<group>"; };
 		98BFB4192BC97AF800E812C0 /* DisplayLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayLink.swift; sourceTree = "<group>"; };
 		98BFB41B2BCAAD8A00E812C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		98BFB41C2BCD7BB800E812C0 /* EqualizerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EqualizerView.swift; sourceTree = "<group>"; };
@@ -176,6 +178,7 @@
 			children = (
 				98BFB4192BC97AF800E812C0 /* DisplayLink.swift */,
 				984DE9542BDAE59C004B427A /* Notifier.swift */,
+				989E08E62BF7A4E300599F17 /* PrefersTabNavigationEnvironmentKey.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -289,6 +292,7 @@
 				9816A8BB2BC87BC200AD1299 /* AudioPlayerService.swift in Sources */,
 				984DE9572BDAFC7E004B427A /* AudioPlayerControlsView.swift in Sources */,
 				9806E8182BC5D12500757370 /* App.swift in Sources */,
+				989E08E72BF7A4E300599F17 /* PrefersTabNavigationEnvironmentKey.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -439,6 +443,8 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioPlayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -470,6 +476,8 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioPlayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

AudioPlayer/AudioPlayer.xcodeproj/xcshareddata/xcschemes/AudioPlayer.xcscheme

@@ -34,6 +34,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      enableThreadSanitizer = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

AudioPlayer/AudioPlayer/App.swift

@@ -41,7 +41,7 @@ func provideEqualizerService(playerService: AudioPlayerService) -> EqualizerServ
 
 func provideAudioPlayerService() -> AudioPlayerService {
     AudioPlayerService(
-        audioPlayer: provideDefaultAudioPlayer()
+        audioPlayerProvider: provideDefaultAudioPlayer
     )
 }
 

AudioPlayer/AudioPlayer/Common/AddNewAudioURLView.swift

@@ -25,7 +25,9 @@ struct AddNewAudioURLView: View {
                     TextField(value: $audioUrl, format: urlStyle, prompt: nil, label: {
                         Text("Insert URL")
                     })
+                    #if os(iOS)
                     .keyboardType(.URL)
+                    #endif
                     .autocorrectionDisabled()
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                     .onSubmit {
@@ -48,6 +50,7 @@ struct AddNewAudioURLView: View {
                     }
                     .foregroundStyle(Color.white)
                 }
+                .buttonStyle(.plain)
                 .disabled(audioUrl == nil)
                 .opacity(audioUrl == nil ? 0.5 : 1.0)
                 .padding(.horizontal, 16)
@@ -56,8 +59,11 @@ struct AddNewAudioURLView: View {
                 .clipShape(RoundedRectangle(cornerRadius: 16))
             }
             .navigationTitle("Add Audio URL")
+            #if os(iOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
             .toolbar {
+#if os(iOS)
                 ToolbarItem(placement: .topBarTrailing) {
                     Button {
                         dismiss()
@@ -65,7 +71,13 @@ struct AddNewAudioURLView: View {
                         Image(systemName: "xmark.circle.fill")
                             .foregroundStyle(Color.gray)
                     }
+                    .buttonStyle(.plain)
                 }
+#else
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done", action: dismiss.callAsFunction)
+                }
+#endif
             }
         }
     }

AudioPlayer/AudioPlayer/Common/AudioTrack.swift

@@ -95,6 +95,8 @@ struct AudioTrackView: View {
             } else if track.status == .buffering {
                 ProgressView()
                     .progressViewStyle(.circular)
+                    .frame(alignment: .center)
+                    .scaleEffect(0.7)
             }
         }
     }

AudioPlayer/AudioPlayer/Content/AudioPlayer/AudioPlayerControlsView.swift

@@ -2,6 +2,7 @@
 //  Created by Dimitris Chatzieleftheriou on 26/04/2024.
 //
 
+import AVFoundation
 import SwiftUI
 
 struct AudioPlayerControls: View {
@@ -17,28 +18,41 @@ struct AudioPlayerControls: View {
         VStack(alignment: .leading) {
             HStack {
                 Button(action: { model.playPause() }) {
-                    Image(systemName: model.isPlaying ? "pause.fill" : "play.fill")
+                    Image(systemName: model.isPlaying ? "pause" : "play")
+                        .symbolVariant(.fill)
                         .font(.title)
                         .imageScale(.small)
                 }
+                .buttonStyle(.plain)
                 .contentTransition(.symbolEffect(.replace))
                 Button(action: {
                     model.stop()
                     currentTrack = nil
                 }) {
-                    Image(systemName: "stop.fill")
+                    Image(systemName: "stop")
+                        .symbolVariant(.fill)
                         .font(.title)
                         .imageScale(.small)
                 }
+                .buttonStyle(.plain)
                 .padding(.leading, 8)
                 Spacer()
-                Button(action: { model.mute() }) {
-                    Image(systemName: model.isMuted ? "speaker.slash.fill" : "speaker.fill")
-                        .font(.title)
-                        .imageScale(.small)
+                HStack {
+                    Slider(value: $model.volume)
+                        .frame(width: 80)
+                        .onChange(of: model.volume) { _, newValue in
+                            model.update(volume: newValue)
+                        }
+                    Button(action: { model.mute() }) {
+                        Image(systemName: model.iconForVolume)
+                            .symbolVariant(model.isMuted || model.volume == 0 ? .slash.fill : .fill)
+                            .foregroundStyle(.teal, .gray)
+                            .font(.title.monospaced())
+                            .imageScale(.small)
+                    }
+                    .buttonStyle(.plain)
+                    .frame(width: 20, height: 20)
                 }
-                .frame(width: 20, height: 20)
-                .contentTransition(.symbolEffect(.replace))
             }
             .tint(.mint)
             .padding(16)
@@ -118,6 +132,8 @@ extension AudioPlayerControls {
         var isPlaying: Bool = false
         var isMuted: Bool = false
 
+        var volume: Float = 0.5
+
         var playbackRate: Double = 0.0
 
         var currentTime: Double = 0
@@ -130,6 +146,19 @@ extension AudioPlayerControls {
 
         var currentTrack: AudioTrack?
 
+        var iconForVolume: String {
+            if isMuted || volume == 0 {
+                return "speaker"
+            }
+            if volume < 0.4 {
+                return "speaker.wave.1"
+            } else if volume < 0.8 {
+                return "speaker.wave.2"
+            } else {
+                return "speaker.wave.3"
+            }
+        }
+
         init(audioPlayerService: AudioPlayerService) {
             self.audioPlayerService = audioPlayerService
 
@@ -204,6 +233,10 @@ extension AudioPlayerControls {
             audioPlayerService.update(rate: rate)
         }
 
+        func update(volume: Float) {
+            audioPlayerService.update(volume: volume)
+        }
+
         func stop() {
             isPlaying = false
             audioPlayerService.stop()

AudioPlayer/AudioPlayer/Content/AudioPlayer/AudioPlayerModel.swift

@@ -3,7 +3,12 @@
 //  Copyright © 2024 Decimal. All rights reserved.
 //
 
+#if os(iOS)
 import UIKit
+#else
+import AppKit
+#endif
+
 import Foundation
 import AudioStreaming
 

AudioPlayer/AudioPlayer/Content/AudioPlayer/AudioPlayerView.swift

@@ -51,24 +51,37 @@ struct AudioPlayerView: View {
         }
         .ignoresSafeArea(.keyboard, edges: .bottom)
         .navigationTitle("Audio Player")
+        #if os(iOS)
         .navigationBarTitleDisplayMode(.inline)
+        #endif
         .toolbar {
-            ToolbarItemGroup(placement: .topBarTrailing) {
+            #if os(iOS)
+            let placement: ToolbarItemPlacement = .topBarTrailing
+            #else
+            let placement: ToolbarItemPlacement = .automatic
+            #endif
+            ToolbarItemGroup(placement: placement) {
                 Button {
                     eqSheetIsShown.toggle()
                 } label: {
                     Image(systemName: "slider.horizontal.3")
                 }
+                .buttonStyle(.plain)
                 Button {
                     addNewAudioIsShown.toggle()
                 } label: {
                     Image(systemName: "plus")
                 }
+                .buttonStyle(.plain)
             }
         }
         .sheet(isPresented: $eqSheetIsShown) {
             EqualizerView(appModel: appModel)
+            #if os(iOS)
                 .presentationDetents([.medium])
+            #elseif os(macOS)
+                .frame(minWidth: 520, maxWidth: .infinity, minHeight: 400, maxHeight: .infinity)
+            #endif
         }
         .sheet(isPresented: $addNewAudioIsShown) {
             AddNewAudioURLView(
@@ -76,7 +89,11 @@ struct AudioPlayerView: View {
                     model.addNewAudioTrack(url: url)
                 }
             )
+            #if os(iOS)
             .presentationDetents([.height(150)])
+            #elseif os(macOS)
+                .frame(minWidth: 320, maxWidth: .infinity, minHeight: 140, maxHeight: .infinity)
+            #endif
         }
     }
 }

AudioPlayer/AudioPlayer/Content/AudioPlayer/EqualizerView.swift

@@ -85,8 +85,11 @@ struct EqualizerView: View {
                 }
             }
             .navigationTitle("Equalizer")
+            #if os(iOS)
             .navigationBarTitleDisplayMode(.inline)
+            #endif
             .toolbar {
+                #if os(iOS)
                 ToolbarItem(placement: .topBarTrailing) {
                     Button {
                         dismiss()
@@ -95,6 +98,11 @@ struct EqualizerView: View {
                             .foregroundStyle(Color.gray)
                     }
                 }
+                #else
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done", action: dismiss.callAsFunction)
+                }
+                #endif
             }
         }
     }

AudioPlayer/AudioPlayer/Dependencies/AudioPlayerService.swift

@@ -44,8 +44,11 @@ final class AudioPlayerService {
     var metadataReceivedNotifier = Notifier<[String: String]>()
     var playingStartedStopped = Notifier<(started: Bool, AudioEntryId, AudioPlayerStopReason?)>()
 
-    init(audioPlayer: AudioPlayer) {
-        player = audioPlayer
+    private let audioPlayerProvider: () -> AudioPlayer
+
+    init(audioPlayerProvider: @escaping () -> AudioPlayer) {
+        self.audioPlayerProvider = audioPlayerProvider
+        player = audioPlayerProvider()
         player.delegate = self
 
         configureAudioSession()
@@ -83,6 +86,10 @@ final class AudioPlayerService {
         player.rate = rate
     }
 
+    func update(volume: Float) {
+        player.volume = volume
+    }
+
     func add(_ node: AVAudioNode) {
         player.attach(node: node)
     }
@@ -104,12 +111,13 @@ final class AudioPlayerService {
     }
 
     private func recreatePlayer() {
-        player = AudioPlayer(configuration: .init(enableLogs: true))
+        player = audioPlayerProvider()
         player.delegate = self
     }
 
     private func registerSessionEvents() {
         // Note that a real app might need to observer other AVAudioSession notifications as well
+#if os(iOS)
         audioSystemResetObserver = NotificationCenter.default.addObserver(
             forName: AVAudioSession.mediaServicesWereResetNotification,
             object: nil,
@@ -118,9 +126,11 @@ final class AudioPlayerService {
             self.configureAudioSession()
             self.recreatePlayer()
         }
+#endif
     }
 
     private func configureAudioSession() {
+#if os(iOS)
         do {
             print("AudioSession category is AVAudioSessionCategoryPlayback")
             try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, policy: .longFormAudio, options: [])
@@ -128,9 +138,11 @@ final class AudioPlayerService {
         } catch let error as NSError {
             print("Couldn't setup audio session category to Playback \(error.localizedDescription)")
         }
+#endif
     }
 
     private func activateAudioSession() {
+#if os(iOS)
         do {
             print("AudioSession is active")
             try AVAudioSession.sharedInstance().setActive(true, options: [])
@@ -138,15 +150,18 @@ final class AudioPlayerService {
         } catch let error as NSError {
             print("Couldn't set audio session to active: \(error.localizedDescription)")
         }
+#endif
     }
 
     private func deactivateAudioSession() {
+#if os(iOS)
         do {
             print("AudioSession is deactivated")
             try AVAudioSession.sharedInstance().setActive(false)
         } catch let error as NSError {
             print("Couldn't deactivate audio session: \(error.localizedDescription)")
         }
+#endif
     }
 }
 
@@ -187,4 +202,3 @@ extension AudioPlayerService: AudioPlayerDelegate {
         delegate?.metadataReceived(metadata: metadata)
     }
 }
-

AudioPlayer/AudioPlayer/Helpers/DisplayLink.swift

@@ -1,14 +1,13 @@
-//
-//  Created by Dimitris C.
-//  Copyright © 2024 Decimal. All rights reserved.
-//
 
+#if os(iOS)
 import UIKit
+#else
+import AppKit
+#endif
 
 final class DisplayLink {
 
-    private var displayLink: CADisplayLink?
-    private var target = DisplayLinkTarget()
+    private var displayLink: DisplayLinkPlatform?
 
     var isPaused: Bool = true {
         didSet {
@@ -16,34 +15,124 @@ final class DisplayLink {
         }
     }
 
-    init(onTick: @escaping (CADisplayLink) -> Void) {
-        target.onTick = onTick
+    init(onTick: @escaping (DisplayLinkFrame) -> Void) {
+        displayLink = DisplayLinkPlatform()
+
+        displayLink?.onTick = onTick
     }
 
     deinit {
         deactivate()
     }
 
+    func activate() {
+        displayLink?.activate()
+        self.isPaused = false
+    }
+
+    func deactivate() {
+        displayLink?.deactivate()
+        isPaused = true
+    }
+}
+
+struct DisplayLinkFrame {
+    var timestamp: TimeInterval
+    var duration: TimeInterval
+}
+
+#if os(iOS)
+final class DisplayLinkPlatform {
+    private final class DisplayLinkTarget {
+        var onTick: ((DisplayLinkFrame) -> Void)?
+
+        @objc func tick(_ link: CADisplayLink) {
+            onTick?(DisplayLinkFrame(timestamp: link.timestamp, duration: link.duration))
+        }
+    }
+
+    var onTick: ((DisplayLinkFrame) -> Void)?
+    private var target = DisplayLinkTarget()
+    var displayLink: CADisplayLink?
+
+    var isPaused: Bool {
+        get { displayLink?.isPaused ?? false }
+        set { displayLink?.isPaused = newValue }
+    }
+
+    init() {
+        displayLink = CADisplayLink(target: target, selector: #selector(DisplayLinkTarget.tick(_:)))
+        target.onTick = { [weak self] value in
+            self?.onTick?(value)
+        }
+    }
+
+    deinit {
+        displayLink?.invalidate()
+    }
+
     func activate() {
         displayLink?.invalidate()
         displayLink = nil
         displayLink = CADisplayLink(target: target, selector: #selector(DisplayLinkTarget.tick(_:)))
         displayLink?.preferredFrameRateRange = .init(minimum: 6, maximum: 10)
         displayLink?.add(to: .current, forMode: .common)
-        self.isPaused = false
     }
 
     func deactivate() {
-        isPaused = true
         displayLink?.invalidate()
         displayLink = nil
     }
 }
+#else
+final class DisplayLinkPlatform {
 
-private final class DisplayLinkTarget {
-    var onTick: ((CADisplayLink) -> Void)?
+    var onTick: ((DisplayLinkFrame) -> Void)?
+    var isPaused: Bool = true {
+        didSet {
+            guard isPaused != oldValue else { return }
+            if isPaused == true {
+                CVDisplayLinkStop(self.displayLink)
+            } else {
+                CVDisplayLinkStart(self.displayLink)
+            }
+        }
+    }
 
-    @objc func tick(_ link: CADisplayLink) {
-        onTick?(link)
+    /// The CVDisplayLink that powers this DisplayLink instance.
+    var displayLink: CVDisplayLink = {
+        var dl: CVDisplayLink? = nil
+        CVDisplayLinkCreateWithActiveCGDisplays(&dl)
+        return dl!
+    }()
+
+    init() {
+        CVDisplayLinkSetOutputHandler(self.displayLink, { [weak self] (displayLink, inNow, inOutputTime, flageIn, flagsOut) -> CVReturn in
+            let frame = DisplayLinkFrame(
+                timestamp: inNow.pointee.timeInterval,
+                duration: inOutputTime.pointee.timeInterval - inNow.pointee.timeInterval)
+
+            DispatchQueue.main.async {
+                guard self?.isPaused == false else { return }
+                self?.onTick?(frame)
+            }
+
+            return kCVReturnSuccess
+        })
+    }
+
+    func activate() {
+        isPaused = true
+    }
+
+    func deactivate() {
+        isPaused = false
     }
 }
+
+extension CVTimeStamp {
+    fileprivate var timeInterval: TimeInterval {
+        return TimeInterval(videoTime) / TimeInterval(self.videoTimeScale)
+    }
+}
+#endif

AudioPlayer/AudioPlayer/Helpers/PrefersTabNavigationEnvironmentKey.swift

@@ -0,0 +1,24 @@
+import SwiftUI
+
+struct PrefersStackNavigationEnvironmentKey: EnvironmentKey {
+    static var defaultValue: Bool = false
+}
+
+extension EnvironmentValues {
+    var prefersStackNavigation: Bool {
+        get { self[PrefersStackNavigationEnvironmentKey.self] }
+        set { self[PrefersStackNavigationEnvironmentKey.self] = newValue }
+    }
+}
+
+#if os(iOS)
+extension PrefersStackNavigationEnvironmentKey: UITraitBridgedEnvironmentKey {
+    static func read(from traitCollection: UITraitCollection) -> Bool {
+        return traitCollection.userInterfaceIdiom == .phone || traitCollection.userInterfaceIdiom == .tv
+    }
+
+    static func write(to mutableTraits: inout UIMutableTraits, value: Bool) {
+        // Do not write.
+    }
+}
+#endif

AudioPlayer/AudioPlayer/Navigation/ContentView.swift

@@ -1,4 +1,4 @@
-//
+ //
 //  Created by Dimitris C.
 //  Copyright © 2024 Decimal. All rights reserved.
 //
@@ -8,28 +8,28 @@ import SwiftUI
 struct ContentView: View {
 
     @Environment(AppModel.self) var appModel
+    @Environment(\.prefersStackNavigation) private var prefersStackNavigation
 
     @State private var selection: NavigationContent?
 
     var body: some View {
-        NavigationStack {
-            List {
-                NavigationLink(value: NavigationContent.audioPlayer) {
-                    Label("Audio Player", systemImage: "play")
-                }
-
-                NavigationLink(value: NavigationContent.audioQueue) {
-                    Label("Audio Queue", systemImage: "play.square.stack")
+        if prefersStackNavigation {
+            NavigationStack {
+                ContentSidebar(selection: $selection)
+                    .navigationTitle("Home")
+            }
+        } else {
+            NavigationSplitView {
+                ContentSidebar(selection: $selection)
+                    .navigationTitle("Home")
+            } detail: {
+                if let selection {
+                    DetailView(selection: selection)
                 }
             }
-            .navigationTitle("Home")
-            .navigationDestination(for: NavigationContent.self) { content in
-                DetailView(selection: content)
+            .onAppear {
+                selection = .audioPlayer
             }
         }
     }
 }
-
-#Preview {
-    ContentView()
-}

AudioPlayer/AudioPlayer/Navigation/Sidebar.swift

@@ -24,6 +24,9 @@ struct ContentSidebar: View {
             }
         }
         .navigationTitle("Home")
+        .navigationDestination(item: $selection, destination: { selection in
+            DetailView(selection: selection)
+        })
     }
 }
 

AudioStreaming.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'AudioStreaming'
-  s.version = '1.2.1'
+  s.version = '1.2.3'
   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

@@ -742,6 +742,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -801,6 +802,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.1.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -831,11 +833,12 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.3;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioStreaming;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -862,11 +865,12 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.3;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.decimal.AudioStreaming;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;

AudioStreaming/Streaming/Audio Entry/AudioEntry.swift

@@ -121,15 +121,21 @@ class AudioEntry {
     }
 
     func duration() -> Double {
-        guard sampleRate > 0 else { return 0 }
+        lock.lock()
+        guard sampleRate > 0 else {
+            lock.unlock()
+            return 0
+        }
 
         if let audioDataPacketOffset = audioStreamState.dataPacketOffset {
             let framesPerPacket = UInt64(audioStreamFormat.mFramesPerPacket)
             if audioDataPacketOffset > 0, framesPerPacket > 0 {
-                return Double(audioDataPacketOffset * framesPerPacket) / audioStreamFormat.mSampleRate
+                let duration = Double(audioDataPacketOffset * framesPerPacket) / audioStreamFormat.mSampleRate
+                lock.unlock()
+                return duration
             }
         }
-
+        lock.unlock()
         let calculatedBitrate = self.calculatedBitrate()
         if calculatedBitrate < 1.0 || source.length == 0 {
             return 0

AudioStreaming/Streaming/AudioPlayer/AudioRendererContext.swift

@@ -9,14 +9,14 @@ import CoreAudio
 var maxFramesPerSlice: AVAudioFrameCount = 8192
 
 final class AudioRendererContext {
-    var waiting = Atomic<Bool>(false)
+    let waiting = Atomic<Bool>(false)
 
     let lock = UnfairLock()
 
     let bufferContext: BufferContext
 
-    var audioBuffer: AudioBuffer
-    var inOutAudioBufferList: UnsafeMutablePointer<AudioBufferList>
+    let audioBuffer: AudioBuffer
+    let inOutAudioBufferList: UnsafeMutablePointer<AudioBufferList>
 
     let packetsSemaphore = DispatchSemaphore(value: 0)
 
@@ -24,7 +24,7 @@ final class AudioRendererContext {
     let framesRequiredAfterRebuffering: UInt32
     let framesRequiredForDataAfterSeekPlaying: UInt32
 
-    var waitingForDataAfterSeekFrameCount = Atomic<Int32>(0)
+    let waitingForDataAfterSeekFrameCount = Atomic<Int32>(0)
 
     private let configuration: AudioPlayerConfiguration
 

AudioStreaming/Streaming/AudioPlayer/Processors/AudioFileStreamProcessor.swift

@@ -214,23 +214,24 @@ final class AudioFileStreamProcessor {
                               propertyId: AudioFileStreamPropertyID,
                               flags _: UnsafeMutablePointer<AudioFileStreamPropertyFlags>)
     {
+        guard let entry = playerContext.audioReadingEntry else { return }
         switch propertyId {
         case kAudioFileStreamProperty_DataOffset:
-            processDataOffset(fileStream: fileStream)
+            processDataOffset(entry: entry, fileStream: fileStream)
         case kAudioFileStreamProperty_FileFormat:
             processFileFormat(fileStream: fileStream)
         case kAudioFileStreamProperty_DataFormat:
-            processDataFormat(fileStream: fileStream)
+            processDataFormat(entry: entry, fileStream: fileStream)
         case kAudioFileStreamProperty_AudioDataByteCount:
-            processDataByteCount(fileStream: fileStream)
+            processDataByteCount(entry: entry, fileStream: fileStream)
         case kAudioFileStreamProperty_AudioDataPacketCount:
-            processAudioDataPacketCount(fileStream: fileStream)
+            processAudioDataPacketCount(entry: entry, fileStream: fileStream)
         case kAudioFileStreamProperty_ReadyToProducePackets:
             // check converter for discontinuous stream
-            processReadyToProducePackets(fileStream: fileStream)
-            processPacketUpperBoundAndMaxPacketSize(fileStream: fileStream)
+            processReadyToProducePackets(entry: entry, fileStream: fileStream)
+            processPacketUpperBoundAndMaxPacketSize(entry: entry, fileStream: fileStream)
         case kAudioFileStreamProperty_FormatList:
-            processFormatList(fileStream: fileStream)
+            processFormatList(entry: entry, fileStream: fileStream)
         default:
             break
         }
@@ -238,19 +239,21 @@ final class AudioFileStreamProcessor {
 
     // MARK: AudioFileStream properties Processing
 
-    private func processDataOffset(fileStream: AudioFileStreamID) {
+    private func processDataOffset(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var offset: UInt64 = 0
         fileStreamGetProperty(value: &offset, fileStream: fileStream, propertyId: kAudioFileStreamProperty_DataOffset)
-        playerContext.audioReadingEntry?.audioStreamState.processedDataFormat = true
-        playerContext.audioReadingEntry?.audioStreamState.dataOffset = offset
+        entry.lock.lock(); defer { playerContext.audioReadingEntry?.lock.unlock() }
+        entry.audioStreamState.processedDataFormat = true
+        entry.audioStreamState.dataOffset = offset
     }
 
-    private func processReadyToProducePackets(fileStream: AudioFileStreamID) {
+    private func processReadyToProducePackets(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var packetCount: UInt64 = 0
         var packetCountSize = UInt32(MemoryLayout.size(ofValue: packetCount))
         AudioFileStreamGetProperty(fileStream, kAudioFileStreamProperty_AudioDataPacketCount, &packetCountSize, &packetCount)
-        playerContext.audioPlayingEntry?.audioStreamState.dataPacketCount = Double(packetCount)
-        if playerContext.audioPlayingEntry?.audioStreamFormat.mFormatID != kAudioFormatLinearPCM {
+        entry.lock.lock(); defer { entry.lock.unlock() }
+        entry.audioStreamState.dataPacketCount = Double(packetCount)
+        if entry.audioStreamFormat.mFormatID != kAudioFormatLinearPCM {
             discontinuous = true
         }
     }
@@ -264,9 +267,9 @@ final class AudioFileStreamProcessor {
         }
     }
 
-    private func processDataFormat(fileStream: AudioFileStreamID) {
+    private func processDataFormat(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var audioStreamFormat = AudioStreamBasicDescription()
-        guard let entry = playerContext.audioReadingEntry else { return }
+        entry.lock.lock(); defer { entry.lock.unlock() }
         if !entry.audioStreamState.processedDataFormat {
             fileStreamGetProperty(value: &audioStreamFormat, fileStream: fileStream, propertyId: kAudioFileStreamProperty_DataFormat)
 
@@ -289,9 +292,8 @@ final class AudioFileStreamProcessor {
                     packetBufferSize = 2048 // default value
                 }
             }
-            entry.lock.withLock {
-                entry.processedPacketsState.bufferSize = packetBufferSize
-            }
+
+            entry.processedPacketsState.bufferSize = packetBufferSize
 
             if !fileFormatsForDelayedConverterCreation.contains(currentFileFormat) {
                 createAudioConverter(from: entry.audioStreamFormat, to: outputAudioFormat)
@@ -299,8 +301,7 @@ final class AudioFileStreamProcessor {
         }
     }
 
-    private func processPacketUpperBoundAndMaxPacketSize(fileStream: AudioFileStreamID) {
-        guard let entry = playerContext.audioReadingEntry else { return }
+    private func processPacketUpperBoundAndMaxPacketSize(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var packetBufferSize: UInt32 = 0
         var status = fileStreamGetProperty(value: &packetBufferSize,
                                            fileStream: fileStream,
@@ -318,21 +319,22 @@ final class AudioFileStreamProcessor {
         }
     }
 
-    private func processDataByteCount(fileStream: AudioFileStreamID) {
-        guard let entry = playerContext.audioReadingEntry else { return }
+    private func processDataByteCount(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var audioDataByteCount: UInt64 = 0
         fileStreamGetProperty(value: &audioDataByteCount, fileStream: fileStream, propertyId: kAudioFileStreamProperty_AudioDataByteCount)
+        entry.lock.lock(); defer { entry.lock.unlock() }
         entry.audioStreamState.dataByteCount = audioDataByteCount
     }
 
-    private func processAudioDataPacketCount(fileStream: AudioFileStreamID) {
-        guard let entry = playerContext.audioReadingEntry else { return }
+    private func processAudioDataPacketCount(entry: AudioEntry, fileStream: AudioFileStreamID) {
         var audioDataPacketCount: UInt64 = 0
         fileStreamGetProperty(value: &audioDataPacketCount, fileStream: fileStream, propertyId: kAudioFileStreamProperty_AudioDataPacketCount)
+        entry.lock.lock(); defer { entry.lock.unlock() }
         entry.audioStreamState.dataPacketOffset = audioDataPacketCount
     }
 
-    private func processFormatList(fileStream: AudioFileStreamID) {
+    private func processFormatList(entry: AudioEntry, fileStream: AudioFileStreamID) {
+        entry.lock.lock(); defer { entry.lock.unlock() }
         let info = fileStreamGetPropertyInfo(fileStream: fileStream, propertyId: kAudioFileStreamProperty_FormatList)
         guard info.status == noErr else { return }
         var list: [AudioFormatListItem] = Array(repeating: AudioFormatListItem(), count: Int(info.size))
@@ -359,11 +361,12 @@ final class AudioFileStreamProcessor {
 
     // MARK: Packets Proc
 
-    func propertyPacketsProc(inNumberBytes: UInt32,
-                             inNumberPackets: UInt32,
-                             inInputData: UnsafeRawPointer,
-                             inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
-    {
+    func propertyPacketsProc(
+        inNumberBytes: UInt32,
+        inNumberPackets: UInt32,
+        inInputData: UnsafeRawPointer,
+        inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?
+    ) {
         guard let entry = playerContext.audioReadingEntry else { return }
         guard entry.audioStreamState.processedDataFormat else { return }
 
@@ -451,16 +454,20 @@ final class AudioFileStreamProcessor {
                 var framesToDecode: UInt32 = rendererContext.bufferContext.totalFrameCount - end
 
                 let offset = Int(end * rendererContext.bufferContext.sizeInBytes)
-                prefillLocalBufferList(bufferList: localBufferList,
-                                       dataOffset: offset,
-                                       framesToDecode: framesToDecode)
+                prefillLocalBufferList(
+                    bufferList: localBufferList,
+                    dataOffset: offset,
+                    framesToDecode: framesToDecode
+                )
 
-                status = AudioConverterFillComplexBuffer(converter,
-                                                         _converterCallback,
-                                                         &convertInfo,
-                                                         &framesToDecode,
-                                                         localBufferList.unsafeMutablePointer,
-                                                         nil)
+                status = AudioConverterFillComplexBuffer(
+                    converter,
+                    _converterCallback,
+                    &convertInfo,
+                    &framesToDecode,
+                    localBufferList.unsafeMutablePointer,
+                    nil
+                )
 
                 framesAdded = framesToDecode
 
@@ -477,16 +484,20 @@ final class AudioFileStreamProcessor {
                     fillUsedFrames(framesCount: framesAdded)
                     continue packetProcess
                 }
-                prefillLocalBufferList(bufferList: localBufferList,
-                                       dataOffset: 0,
-                                       framesToDecode: framesToDecode)
+                prefillLocalBufferList(
+                    bufferList: localBufferList,
+                    dataOffset: 0,
+                    framesToDecode: framesToDecode
+                )
 
-                status = AudioConverterFillComplexBuffer(converter,
-                                                         _converterCallback,
-                                                         &convertInfo,
-                                                         &framesToDecode,
-                                                         localBufferList.unsafeMutablePointer,
-                                                         nil)
+                status = AudioConverterFillComplexBuffer(
+                    converter,
+                    _converterCallback,
+                    &convertInfo,
+                    &framesToDecode,
+                    localBufferList.unsafeMutablePointer,
+                    nil
+                )
 
                 framesAdded += framesToDecode
 
@@ -505,16 +516,20 @@ final class AudioFileStreamProcessor {
                 var framesToDecode: UInt32 = start - end
 
                 let offset = Int(end * rendererContext.bufferContext.sizeInBytes)
-                prefillLocalBufferList(bufferList: localBufferList,
-                                       dataOffset: offset,
-                                       framesToDecode: framesToDecode)
+                prefillLocalBufferList(
+                    bufferList: localBufferList,
+                    dataOffset: offset,
+                    framesToDecode: framesToDecode
+                )
 
-                status = AudioConverterFillComplexBuffer(converter,
-                                                         _converterCallback,
-                                                         &convertInfo,
-                                                         &framesToDecode,
-                                                         localBufferList.unsafeMutablePointer,
-                                                         nil)
+                status = AudioConverterFillComplexBuffer(
+                    converter,
+                    _converterCallback,
+                    &convertInfo,
+                    &framesToDecode,
+                    localBufferList.unsafeMutablePointer,
+                    nil
+                )
 
                 framesAdded = framesToDecode
                 if status == AudioConvertStatus.done.rawValue {
@@ -537,10 +552,11 @@ final class AudioFileStreamProcessor {
     /// - parameter dataOffset: An `Int` value indicating any offset to be applied to the buffer data
     /// - parameter framesToDecode: An `UInt32` value indicating the frames to be decoded, used in calculating the data size of the buffer.
     @inline(__always)
-    private func prefillLocalBufferList(bufferList: UnsafeMutableAudioBufferListPointer,
-                                        dataOffset: Int,
-                                        framesToDecode: UInt32)
-    {
+    private func prefillLocalBufferList(
+        bufferList: UnsafeMutableAudioBufferListPointer,
+        dataOffset: Int,
+        framesToDecode: UInt32
+    ) {
         if let mData = rendererContext.audioBuffer.mData {
             bufferList[0].mData = dataOffset > 0 ? mData + dataOffset : mData
         }
@@ -563,9 +579,10 @@ final class AudioFileStreamProcessor {
     }
 
     @inline(__always)
-    private func updateProcessedPackets(inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?,
-                                        inNumberPackets: UInt32)
-    {
+    private func updateProcessedPackets(
+        inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?,
+        inNumberPackets: UInt32
+    ) {
         guard let inPacketDescriptions = inPacketDescriptions else { return }
         guard let readingEntry = playerContext.audioReadingEntry else { return }
         let processedPackCount = readingEntry.processedPacketsState.count
@@ -585,23 +602,25 @@ final class AudioFileStreamProcessor {
 
 // MARK: - AudioFileStream proc method
 
-private func _propertyListenerProc(clientData: UnsafeMutableRawPointer,
-                                   fileStream: AudioFileStreamID,
-                                   propertyId: AudioFileStreamPropertyID,
-                                   flags: UnsafeMutablePointer<AudioFileStreamPropertyFlags>)
-{
+private func _propertyListenerProc(
+    clientData: UnsafeMutableRawPointer,
+    fileStream: AudioFileStreamID,
+    propertyId: AudioFileStreamPropertyID,
+    flags: UnsafeMutablePointer<AudioFileStreamPropertyFlags>
+) {
     let processor = clientData.to(type: AudioFileStreamProcessor.self)
     processor.propertyListenerProc(fileStream: fileStream,
                                    propertyId: propertyId,
                                    flags: flags)
 }
 
-private func _propertyPacketsProc(clientData: UnsafeMutableRawPointer,
-                                  inNumberBytes: UInt32,
-                                  inNumberPackets: UInt32,
-                                  inInputData: UnsafeRawPointer,
-                                  inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
-{
+private func _propertyPacketsProc(
+    clientData: UnsafeMutableRawPointer,
+    inNumberBytes: UInt32,
+    inNumberPackets: UInt32,
+    inInputData: UnsafeRawPointer,
+    inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?
+) {
     let processor = clientData.to(type: AudioFileStreamProcessor.self)
     processor.propertyPacketsProc(inNumberBytes: inNumberBytes,
                                   inNumberPackets: inNumberPackets,
@@ -611,12 +630,13 @@ private func _propertyPacketsProc(clientData: UnsafeMutableRawPointer,
 
 // MARK: - AudioConverterFillComplexBuffer callback method
 
-private func _converterCallback(inAudioConverter _: AudioConverterRef,
-                                ioNumberDataPackets: UnsafeMutablePointer<UInt32>,
-                                ioData: UnsafeMutablePointer<AudioBufferList>,
-                                outDataPacketDescription: UnsafeMutablePointer<UnsafeMutablePointer<AudioStreamPacketDescription>?>?,
-                                inUserData: UnsafeMutableRawPointer?) -> OSStatus
-{
+private func _converterCallback(
+    inAudioConverter _: AudioConverterRef,
+    ioNumberDataPackets: UnsafeMutablePointer<UInt32>,
+    ioData: UnsafeMutablePointer<AudioBufferList>,
+    outDataPacketDescription: UnsafeMutablePointer<UnsafeMutablePointer<AudioStreamPacketDescription>?>?,
+    inUserData: UnsafeMutableRawPointer?
+) -> OSStatus {
     guard let convertInfo = inUserData?.assumingMemoryBound(to: AudioConvertInfo.self) else { return 0 }
 
     // we need to tell the converter to stop converting after it should stop converting

AudioStreaming/Streaming/AudioPlayer/Processors/AudioPlayerRenderProcessor.swift

@@ -114,9 +114,7 @@ final class AudioPlayerRenderProcessor: NSObject {
                     }
                 } else {
                     if let mDataBuffer = audioBuffer.mData {
-                        memcpy(bufferList.mBuffers.mData,
-                               mDataBuffer + Int(start * frameSizeInBytes),
-                               Int(bufferList.mBuffers.mDataByteSize))
+                        memcpy(bufferList.mBuffers.mData, mDataBuffer + Int(start * frameSizeInBytes), Int(bufferList.mBuffers.mDataByteSize))
                     }
                 }
                 totalFramesCopied = framesToCopy
@@ -137,9 +135,7 @@ final class AudioPlayerRenderProcessor: NSObject {
                     }
                 } else {
                     if let mDataBuffer = audioBuffer.mData {
-                        memcpy(bufferList.mBuffers.mData,
-                               mDataBuffer + Int(start * frameSizeInBytes),
-                               Int(bufferList.mBuffers.mDataByteSize))
+                        memcpy(bufferList.mBuffers.mData, mDataBuffer + Int(start * frameSizeInBytes), Int(bufferList.mBuffers.mDataByteSize))
                     }
                 }
 
@@ -154,9 +150,7 @@ final class AudioPlayerRenderProcessor: NSObject {
                             memset(ioBufferData + Int(frameToCopy * frameSizeInBytes), 0, Int(frameSizeInBytes * moreFramesToCopy))
                         } else {
                             if let mDataBuffer = audioBuffer.mData {
-                                memcpy(ioBufferData + Int(frameToCopy * frameSizeInBytes),
-                                       mDataBuffer,
-                                       Int(frameSizeInBytes * moreFramesToCopy))
+                                memcpy(ioBufferData + Int(frameToCopy * frameSizeInBytes), mDataBuffer, Int(frameSizeInBytes * moreFramesToCopy))
                             }
                         }
                     }
@@ -270,10 +264,11 @@ final class AudioPlayerRenderProcessor: NSObject {
         return UnsafePointer(rendererContext.inOutAudioBufferList)
     }
 
-    func render(inNumberFrames: UInt32,
-                ioData: UnsafeMutablePointer<AudioBufferList>,
-                flags _: UnsafeMutablePointer<AudioUnitRenderActionFlags>) -> OSStatus
-    {
+    func render(
+        inNumberFrames: UInt32,
+        ioData: UnsafeMutablePointer<AudioBufferList>,
+        flags _: UnsafeMutablePointer<AudioUnitRenderActionFlags>
+    ) -> OSStatus {
         var status = noErr
 
         rendererContext.inOutAudioBufferList[0].mBuffers.mData = ioData.pointee.mBuffers.mData
@@ -308,13 +303,18 @@ final class AudioPlayerRenderProcessor: NSObject {
         return status
     }
 
-    func renderProvider(flags: UnsafeMutablePointer<AudioUnitRenderActionFlags>,
-                        timeStamp _: UnsafePointer<AudioTimeStamp>,
-                        inNumberFrames: AUAudioFrameCount,
-                        inputBusNumber: Int,
-                        inputData: UnsafeMutablePointer<AudioBufferList>) -> AUAudioUnitStatus
-    {
+    func renderProvider(
+        flags: UnsafeMutablePointer<AudioUnitRenderActionFlags>,
+        timeStamp _: UnsafePointer<AudioTimeStamp>,
+        inNumberFrames: AUAudioFrameCount,
+        inputBusNumber: Int,
+        inputData: UnsafeMutablePointer<AudioBufferList>
+    ) -> AUAudioUnitStatus {
         guard inputBusNumber == 0 else { return noErr }
-        return render(inNumberFrames: inNumberFrames, ioData: inputData, flags: flags)
+        return render(
+            inNumberFrames: inNumberFrames,
+            ioData: inputData,
+            flags: flags
+        )
     }
 }

Package.swift

@@ -6,6 +6,7 @@ let package = Package(
     name: "AudioStreaming",
     platforms: [
         .iOS(.v12),
+        .macOS(.v13)
     ],
     products: [
         .library(