Skip to content

fix: Metronome audio handling #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
allansrc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Metronome audio handling #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions darwin/metronome/Sources/metronome/Metronome.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class Metronome {
setupNotifications()
#endif
}
private func reconnectPlayerNode() {
audioEngine.disconnectNodeOutput(audioPlayerNode)
audioEngine.connect(audioPlayerNode, to: mixerNode, format: audioFileMain.processingFormat)
}

/// Start the metronome.
func play() {
if !audioEngine.isRunning {
Expand Down Expand Up @@ -116,18 +121,21 @@ class Metronome {
}

func setAudioFile(mainFileBytes: Data, accentedFileBytes: Data) {
if mainFileBytes.isEmpty && accentedFileBytes.isEmpty { return }

let wasPlaying = isPlaying
if wasPlaying { stop() }

if !mainFileBytes.isEmpty {
audioFileMain = try! AVAudioFile(fromData: mainFileBytes)
}
if !accentedFileBytes.isEmpty {
audioFileAccented = try! AVAudioFile(fromData: accentedFileBytes)
}
if !mainFileBytes.isEmpty || !accentedFileBytes.isEmpty {
if isPlaying {
pause()
play()
}
}

reconnectPlayerNode()

if wasPlaying { play() }
}

var getTimeSignature: Int {
Expand Down Expand Up @@ -173,34 +181,26 @@ class Metronome {
}
}
private func handleRouteChange(_ notification: Notification) {
// let reasonValue = notification.userInfo?[AVAudioSessionRouteChangeReasonKey] as? UInt
// let reason = AVAudioSession.RouteChangeReason(rawValue: reasonValue ?? 0)
// print("Audio route changed. Reason: \(String(describing: reason))")
let wasPlaying = isPlaying
if wasPlaying {
pause()
self.stop()
}

DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
do {
// let session = AVAudioSession.sharedInstance()
// let outputs = session.currentRoute.outputs
// print("Current audio outputs: \(outputs.map { $0.portType.rawValue })")
self.audioPlayerNode.stop()
self.audioEngine.stop()
self.audioEngine.reset()
self.audioPlayerNode.stop()
self.audioEngine.stop()
self.audioEngine.reset()

do {
try self.audioEngine.start()
} catch {
print("Audio engine failed to restart: \(error.localizedDescription)")
}
self.reconnectPlayerNode()

if wasPlaying {
self.play()
}
do {
try self.audioEngine.start()
} catch {
print("Failed to handle audio route change: \(error.localizedDescription)")
print("Audio engine failed to restart: \(error.localizedDescription)")
}

if wasPlaying {
self.play()
}
}
}
Expand Down