From 9b2500b2df06517387fb09b1276de60c2b1803f3 Mon Sep 17 00:00:00 2001
From: Marc Brooks <IDisposable@gmail.com>
Date: Mon, 17 Nov 2025 15:46:00 -0600
Subject: [PATCH] Extract alsaDevice configuration to helper

---
 audio.go   | 37 +++++++++++++++----------------------
 jsonrpc.go |  3 ++-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/audio.go b/audio.go
index 88f16c96..a5305dd2 100644
--- a/audio.go
+++ b/audio.go
@@ -28,6 +28,14 @@ var (
 	audioInputEnabled  atomic.Bool
 )
 
+func getAlsaDevice(source string) string {
+	if source == "hdmi" {
+		return "hw:0,0"
+	} else {
+		return "hw:1,0"
+	}
+}
+
 func initAudio() {
 	audioLogger = logging.GetDefaultLogger().With().Str("component", "audio-manager").Logger()
 
@@ -40,7 +48,7 @@ func initAudio() {
 }
 
 func getAudioConfig() audio.AudioConfig {
-	ensureConfigLoaded()
+	// config is already loaded
 	cfg := audio.DefaultAudioConfig()
 	if config.AudioBitrate >= 64 && config.AudioBitrate <= 256 {
 		cfg.Bitrate = uint16(config.AudioBitrate)
@@ -73,11 +81,7 @@ func startAudio() error {
 
 	if outputSource == nil && audioOutputEnabled.Load() && currentAudioTrack != nil {
 		ensureConfigLoaded()
-		alsaDevice := "hw:1,0"
-		if config.AudioOutputSource == "hdmi" {
-			alsaDevice = "hw:0,0"
-		}
-
+		alsaDevice := getAlsaDevice(config.AudioOutputSource)
 		source := audio.NewCgoOutputSource(alsaDevice)
 		source.SetConfig(getAudioConfig())
 		outputSource = source
@@ -89,8 +93,7 @@ func startAudio() error {
 
 	ensureConfigLoaded()
 	if inputSource.Load() == nil && audioInputEnabled.Load() && config.UsbDevices != nil && config.UsbDevices.Audio {
-		alsaPlaybackDevice := "hw:1,0"
-
+		alsaPlaybackDevice := getAlsaDevice("usb")
 		source := audio.NewCgoInputSource(alsaPlaybackDevice)
 		source.SetConfig(getAudioConfig())
 		var audioSource audio.AudioSource = source
@@ -175,11 +178,8 @@ func setAudioTrack(audioTrack *webrtc.TrackLocalStaticSample) {
 	var newSource audio.AudioSource
 	if currentAudioTrack != nil && audioOutputEnabled.Load() {
 		ensureConfigLoaded()
-		alsaDevice := "hw:1,0"
-		if config.AudioOutputSource == "hdmi" {
-			alsaDevice = "hw:0,0"
-		}
-		newSource = audio.NewCgoOutputSource(alsaDevice)
+		alsaDevice := getAlsaDevice(config.AudioOutputSource)
+		newSource := audio.NewCgoOutputSource(alsaDevice)
 		newSource.SetConfig(getAudioConfig())
 		newRelay = audio.NewOutputRelay(newSource, currentAudioTrack)
 		outputSource = newSource
@@ -255,11 +255,7 @@ func SetAudioOutputSource(source string) error {
 	stopOutputAudio()
 
 	if audioOutputEnabled.Load() && activeConnections.Load() > 0 && currentAudioTrack != nil {
-		alsaDevice := "hw:1,0"
-		if source == "hdmi" {
-			alsaDevice = "hw:0,0"
-		}
-
+		alsaDevice := getAlsaDevice(source)
 		newSource := audio.NewCgoOutputSource(alsaDevice)
 		newSource.SetConfig(getAudioConfig())
 		newRelay := audio.NewOutputRelay(newSource, currentAudioTrack)
@@ -291,10 +287,7 @@ func RestartAudioOutput() {
 	stopOutputAudio()
 
 	ensureConfigLoaded()
-	alsaDevice := "hw:1,0"
-	if config.AudioOutputSource == "hdmi" {
-		alsaDevice = "hw:0,0"
-	}
+	alsaDevice := getAlsaDevice(config.AudioOutputSource)
 
 	newSource := audio.NewCgoOutputSource(alsaDevice)
 	newSource.SetConfig(getAudioConfig())
diff --git a/jsonrpc.go b/jsonrpc.go
index 69235805..1d596eaf 100644
--- a/jsonrpc.go
+++ b/jsonrpc.go
@@ -926,7 +926,8 @@ func updateUsbRelatedConfig(wasAudioEnabled bool) error {
 		config.AudioOutputSource = "hdmi"
 		stopOutputAudio()
 		if audioOutputEnabled.Load() && activeConnections.Load() > 0 && currentAudioTrack != nil {
-			newSource := audio.NewCgoOutputSource("hw:0,0")
+			alsaDevice := getAlsaDevice("hdmi")
+			newSource := audio.NewCgoOutputSource(alsaDevice)
 			newSource.SetConfig(getAudioConfig())
 			newRelay := audio.NewOutputRelay(newSource, currentAudioTrack)