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

[Halim Sahin]

Hi,
> diff --git a/config/speechd.conf.in b/config/speechd.conf.in
> index f17e28f..6fa4936 100644
> --- a/config/speechd.conf.in
> +++ b/config/speechd.conf.in
> @@ -149,22 +149,17 @@ 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
+ libao  a cross platform audio output 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. 
> -#
> +# 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.
>  
> -# AudioOutputMethod "pulse,alsa"
> +# 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
> 
> 
> _______________________________________________
> Speechd mailing list
> Speechd at lists.freebsoft.org
> http://lists.freebsoft.org/mailman/listinfo/speechd
Halim Sahin
E-Mail:                         
halim.sahin (at) t-online.de