diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 1d599d91..505fd358 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -19,6 +19,7 @@ enum PlayMethod:Int { class AudioPlayer: NSObject { internal let queue = DispatchQueue(label: "ABSAudioPlayerQueue") + internal let logger = AppLogger(category: "AudioPlayer") // enums and @objc are not compatible @objc dynamic var status: Int @@ -68,7 +69,7 @@ class AudioPlayer: NSObject { let playbackSession = self.getPlaybackSession() guard let playbackSession = playbackSession else { - NSLog("Failed to fetch playback session. Player will not initialize") + logger.error("Failed to fetch playback session. Player will not initialize") NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.failed.rawValue), object: nil) return } @@ -86,10 +87,10 @@ class AudioPlayer: NSObject { } self.currentTrackIndex = getItemIndexForTime(time: playbackSession.currentTime) - NSLog("Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)") + logger.debug("Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)") let playerItems = self.allPlayerItems[self.currentTrackIndex.. 0.0 && rate != self.tmpRate && !(observed && rate == 1) if self.audioPlayer.rate != rate { - NSLog("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)") + logger.debug("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)") self.audioPlayer.rate = rate } @@ -477,7 +481,7 @@ class AudioPlayer: NSObject { } else if (playbackSession.playMethod == PlayMethod.local.rawValue) { guard let localFile = track.getLocalFile() else { // Worst case we can stream the file - NSLog("Unable to play local file. Resulting to streaming \(track.localFileId ?? "Unknown")") + logger.debug("Unable to play local file. Resulting to streaming \(track.localFileId ?? "Unknown")") let filename = track.metadata?.filename ?? "" let filenameEncoded = filename.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlQueryAllowed) let urlstr = "\(Store.serverConfig!.address)/s/item/\(itemId)/\(filenameEncoded ?? "")?token=\(Store.serverConfig!.token)" @@ -497,8 +501,8 @@ class AudioPlayer: NSObject { do { try AVAudioSession.sharedInstance().setCategory(.playback, mode: .spokenAudio) } catch { - NSLog("Failed to set AVAudioSession category") - print(error) + logger.error("Failed to set AVAudioSession category") + logger.error(error) } } @@ -506,7 +510,7 @@ class AudioPlayer: NSObject { do { try AVAudioSession.sharedInstance().setActive(active) } catch { - NSLog("Failed to set audio session as active=\(active)") + logger.error("Failed to set audio session as active=\(active)") } } @@ -637,11 +641,11 @@ class AudioPlayer: NSObject { public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { if context == &playerContext { if keyPath == #keyPath(AVPlayer.rate) { - NSLog("playerContext observer player rate") + logger.debug("playerContext observer player rate") self.setPlaybackRate(change?[.newKey] as? Float ?? 1.0, observed: true) } else if keyPath == #keyPath(AVPlayer.currentItem) { NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.update.rawValue), object: nil) - NSLog("WARNING: Item ended") + logger.debug("WARNING: Item ended") } } else { super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)