[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] modules - Fix audio fallback logic
From: |
Luke Yelavich |
Subject: |
[PATCH 2/2] modules - Fix audio fallback logic |
Date: |
Fri, 4 Sep 2009 14:10:28 +1000 |
From: Luke Yelavich <address@hidden>
To: address@hidden
Once we have found and audio output thats available, break out of the loop.
---
src/modules/module_utils.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 575debf..27110a4 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -1110,6 +1110,7 @@ module_audio_init_spd(char **status_info)
if (module_audio_id){
module_audio_output_method = AUDIO_ALSA;
audio_output_set = 1;
+ break;
}
} else if (len == 3 && strncmp("nas", outputs, len) == 0){
DBG("Using NAS audio output method");
@@ -1119,6 +1120,7 @@ module_audio_init_spd(char **status_info)
if (module_audio_id){
module_audio_output_method = AUDIO_NAS;
audio_output_set = 1;
+ break;
}
} else if (len == 5 && strncmp("pulse", outputs, len) == 0){
DBG("Using PulseAudio output method");
@@ -1132,6 +1134,7 @@ module_audio_init_spd(char **status_info)
if (module_audio_id){
module_audio_output_method = AUDIO_PULSE;
audio_output_set = 1;
+ break;
}
} else{
ABORT("Sound output method specified in configuration not
supported. "
--
1.6.3.3