[PATCH 2/2] config - Set the audio output to be "pulse, alsa" by default

[Luke Yelavich]

From: Luke Yelavich <address@hidden>
To: address@hidden

Now we have graceful audio fallback support, we can set the default output
to something that should ensure audio output on any new speech-dispatcher
install. The output order should be self explanetory.
---
 ChangeLog              |    8 ++++++++
 config/speechd.conf.in |    2 +-
 src/server/config.c    |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e5e0e3..2c09a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-08  Luke Yelavich <luke.yelavich at canonical.com>
+
+       * src/server/config.c (load_default_global_set_options): Set the default
+       audio output to "pulse,alsa".
+
+       * config/speechd.conf.in: Set the default audio output to
+       "pulse,alsa".
+
 2009-06-23  Luke Yelavich <luke.yelavich at canonical.com>
 
        * src/server/config.c: Add new macro GLOBAL_SET_LOGLEVEL, to set the
diff --git a/config/speechd.conf.in b/config/speechd.conf.in
index abd458f..2bc6c49 100644
--- a/config/speechd.conf.in
+++ b/config/speechd.conf.in
@@ -142,7 +142,7 @@ DefaultVolume 100
 # PulseAudio is a sound server for POSIX and WIN32 systems. 
 #
 
-# AudioOutputMethod "alsa"
+# AudioOutputMethod "pulse,alsa"
 
 # What ALSA device to use when Advanced Linux Sound Architecture is
 # chosen for the audio output.
diff --git a/src/server/config.c b/src/server/config.c
index f47af0d..520d937 100644
--- a/src/server/config.c
+++ b/src/server/config.c
@@ -444,7 +444,7 @@ load_default_global_set_options()
     GlobalFDSet.ssml_mode = 0;
     GlobalFDSet.notification = NOTIFY_NOTHING;
 
-    GlobalFDSet.audio_output_method = strdup("alsa");
+    GlobalFDSet.audio_output_method = strdup("pulse,alsa");
     GlobalFDSet.audio_oss_device = strdup("/dev/dsp");
     GlobalFDSet.audio_alsa_device = strdup("default");
     GlobalFDSet.audio_nas_server = strdup("tcp/localhost:5450");
-- 
1.6.3.3