🆙 FIXUP: Use oslog instead of print

Author: superturboryan

Sources/Control/Control.swift

@@ -5,3 +5,8 @@
 
 /// Library namespace.
 public enum Control {}
+
+extension Control {
+    
+    static let subsystem = "com.ControlKit.Control"
+}

Sources/Control/Extensions/MPVolumeView.swift

@@ -4,6 +4,7 @@
 //
 
 import MediaPlayer
+import OSLog
 
 extension MPVolumeView {
 
@@ -18,15 +19,15 @@ extension MPVolumeView {
 
     static func increaseVolume(_ amount: Float) {
         guard volume <= 1 else {
-            print("🚨 Volume is already at max")
+            log.warning("Volume is already at max")
             return
         }
         volume = max(1, volume + amount)
     }
 
     static func decreaseVolume(_ amount: Float) {
         guard volume >= 0 else {
-            print("🚨 Volume is already at min")
+            log.warning("Volume is already at min")
             return
         }
         volume = min(0, volume - amount)
@@ -37,6 +38,8 @@ private extension MPVolumeView {
 
     static let shared = MPVolumeView()
 
+    static let log = Logger(subsystem: Control.subsystem, category: "MPVolumeView_Extension")
+    
     var slider: UISlider? {
         subviews.first(where: { $0 is UISlider }) as? UISlider
     }

Sources/Control/Playback.swift

@@ -5,6 +5,7 @@
 
 import AVFAudio
 import MediaPlayer
+import OSLog
 
 public extension Control {
 
@@ -19,10 +20,14 @@ public extension Control {
         ///
         /// Playback that has been paused by this function can normally be resumed if the app playing the content has not been terminated.
         public static func togglePlayPause() {
-            try? avAudioSession.setActive(
-                isAudioPlaying,
-                options: .notifyOthersOnDeactivation
-            )
+            do {
+                try avAudioSession.setActive(
+                    isAudioPlaying,
+                    options: .notifyOthersOnDeactivation
+                )
+            } catch {
+                log.error("\(error.localizedDescription)")
+            }
         }
     }
 }
@@ -53,6 +58,11 @@ public extension Control.Playback {
     }
 }
 
+private extension Control.Playback {
+    
+    static let log = Logger(subsystem: Control.subsystem, category: "Playback")
+}
+
 private extension MPMusicPlaybackState {
 
     var isPlaying: Bool {

Sources/Controllers/Config/Controllers.swift

@@ -0,0 +1,12 @@
+//
+//  Controllers.swift
+//  ControlKit
+//
+
+/// Library namespace.
+enum Controllers {}
+
+extension Controllers {
+    
+    static let subsystem = "com.ControlKit.Controllers"
+}

Sources/Controllers/SpotifyController.swift

@@ -3,12 +3,15 @@
 //  ControlKit
 //
 
+import OSLog
 import SpotifyiOS
 import SwiftUI
 
 /// Wrapper for ``SPTAppRemote`` - use this to control playback from the Spotify app.
 public final class SpotifyController: NSObject, ObservableObject {
 
+    @Published public var isPlaying: Bool = false
+    
     lazy private var remote: SPTAppRemote = {
         let remote = SPTAppRemote(
             configuration: SPTConfiguration(
@@ -19,6 +22,7 @@ public final class SpotifyController: NSObject, ObservableObject {
         )
         remote.connectionParameters.accessToken = accessToken
         remote.delegate = self
+        remote.playerAPI?.delegate = self
         return remote
     }()
 
@@ -86,18 +90,30 @@ extension SpotifyController: PlaybackController {
 extension SpotifyController: SPTAppRemoteDelegate {
 
     public func appRemoteDidEstablishConnection(_ appRemote: SPTAppRemote) {
-        print("appRemoteDidEstablishConnection")
+        SpotifyController.log.info("SPTAppRemoteDelegate.appRemoteDidEstablishConnection")
     }
 
     public func appRemote(_ appRemote: SPTAppRemote, didFailConnectionAttemptWithError error: (any Error)?) {
-        print("didFailConnectionAttemptWithError")
+        SpotifyController.log.info("SPTAppRemoteDelegate.didFailConnectionAttemptWithError")
     }
 
     public func appRemote(_ appRemote: SPTAppRemote, didDisconnectWithError error: (any Error)?) {
-        print("didDisconnectWithError")
+        SpotifyController.log.info("SPTAppRemoteDelegate.didDisconnectWithError")
+    }
+}
+
+extension SpotifyController: SPTAppRemotePlayerStateDelegate {
+    
+    public func playerStateDidChange(_ playerState: any SPTAppRemotePlayerState) {
+        isPlaying = !playerState.isPaused
     }
 }
 
+private extension SpotifyController {
+    
+    static let log = Logger(subsystem: Controllers.subsystem, category: "SpotifyController")
+}
+
 private extension SPTAppRemote {
 
     func togglePlayPause() {

Sources/Controllers/SystemController.swift

@@ -67,7 +67,15 @@ extension SystemController: @preconcurrency PlaybackController {
     }
 
     private func updateIsAudioPlaying() {
-        isAudioPlaying = Control.Playback.isAudioPlaying
+        switch selectedPlaybackType {
+            
+        case .AppleMusic:
+            isAudioPlaying = appleMusic.isPlaying
+        case .Spotify:
+            isAudioPlaying = spotify.isPlaying
+        case .AVAudio:
+            isAudioPlaying = Control.Playback.isAudioPlaying
+        }
     }
 }