[PATCH 2/3] Disable audio fallback and use Pulse Audio by default

[Hynek Hanke]

Audio fallback is the right solution, but a prerequisite
is proper freeing of resources when the given instance
of server is not in an active session. Since this
is currently not implemented, audio fallback leads
to problems.

Under the previous settings "pulse, alsa", if
Speech Dispatcher is started in a session where
Pulse is not available, it will open ALSA, thus
preventing Pulse to start in all other sessions.
This subsequently breaks all audio for all
users although the session which blocks the
device is actually not active.

To prevent this, audio fallback is not used
by default.

Additionally, mention libao, which was missing.
---
 config/speechd.conf.in |   26 ++++++++++++--------------
 src/server/config.c    |    2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/config/speechd.conf.in b/config/speechd.conf.in
index f17e28f..42fdbc1 100644
--- a/config/speechd.conf.in
+++ b/config/speechd.conf.in
@@ -149,22 +149,20 @@ DefaultVolume 100
 
 # -- AUDIO OUTPUT --
 
-# Chooses between three possible sound output systems:
-#       "oss"   - Open Sound System
+# Chooses between the possible sound output systems:
+#       "pulse" - PulseAudio
 #       "alsa"  - Advanced Linux Sound System
+#       "oss"   - Open Sound System
 #       "nas"   - Network Audio System
-#       "pulse" - PulseAudio
-# ALSA is default and recommended. The recent implementations
-# support mixing of multiple streams. OSS is only provided
-# for compatibility with architectures that do not include ALSA.
-# NAS is an audio server with higher level of control over
-# your audio stream, with the possibility to stream your audio
-# over the network to a different computer and other advanced
-# features. (The NAS backend is not very well tested however.)
-# PulseAudio is a sound server for POSIX and WIN32 systems. 
-#
-
-# AudioOutputMethod "pulse,alsa"
+#       "libao" - A cross platform audio library
+# Pulse audio is the default and recommended sound server. OSS and ALSA
+# are only provided for compatibility with architectures that do not
+# include Pulse Audio. NAS provides network transparency, but is not
+# very well tested. libao is a cross platform library with plugins for
+# different sound systems and provides alternative output for Pulse Audio
+# and ALSA as well as for other backends.
+
+# AudioOutputMethod "pulse"
 
 # 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 66cfa96..0d87173 100644
--- a/src/server/config.c
+++ b/src/server/config.c
@@ -454,7 +454,7 @@ load_default_global_set_options()
 /* Added by Willie Walker - default to OSS for Solaris */
     GlobalFDSet.audio_output_method = strdup("oss");
 #else
-    GlobalFDSet.audio_output_method = strdup("pulse,alsa");
+    GlobalFDSet.audio_output_method = strdup("pulse");
 #endif /* __SUNPRO_C */
     GlobalFDSet.audio_oss_device = strdup("/dev/dsp");
     GlobalFDSet.audio_alsa_device = strdup("default");
-- 
1.7.0.4