Bug#577217: [PATCH] speech-dispatcher locks main audio pcm preventing other apps to use sound

2010-05-05 Thread Andres Mejia
tags 577217 patch fixed-upstream
thanks

Attached is a patch that updates the packaging to make speech-dispatcher use
pulse by default instead of alsa. The idea was taken from upstream [1]. This
would prevent the locking of audio devices from speech-dispatcher.

What would probably be better is to package a new version of speech-dispatcher
from the 0.6.8~unofficial~rc2 release [2]. Ubuntu has already done so in lucid.

[1] 
http://git.freebsoft.org/?p=speechd.git;a=commitdiff;h=ce127be6fcfbcb93cb4bd891b662e8483c11f4c5
[2] 
http://git.freebsoft.org/?p=speechd.git;a=commit;h=a4f04906e633d7577892131620eb138ba94e0a50

-- 
Regards,
Andres Mejia
diff --git a/debian/patches/08_pulse-default.dpatch b/debian/patches/08_pulse-default.dpatch
new file mode 100755
index 000..f82e0db
--- /dev/null
+++ b/debian/patches/08_pulse-default.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_pulse-default.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix to make using pulse the default instead of alsa.
+## DP: See http://bugs.debian.org/577217
+
+...@dpatch@
+diff --git a/config/speechd.conf.in b/config/speechd.conf.in
+index abd458f..b657fbf 100644
+--- a/config/speechd.conf.in
 b/config/speechd.conf.in
+@@ -132,7 +132,7 @@ DefaultVolume 100
+ #   alsa  - Advanced Linux Sound System
+ #   nas   - Network Audio System
+ #   pulse - PulseAudio
+-# ALSA is default and recommended. The recent implementations
++# PulseAudio 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
+@@ -142,7 +142,7 @@ DefaultVolume 100
+ # PulseAudio is a sound server for POSIX and WIN32 systems. 
+ #
+ 
+-# AudioOutputMethod 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 7c8f662..82e34d0 100644
+--- a/src/server/config.c
 b/src/server/config.c
+@@ -431,7 +431,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);
+ GlobalFDSet.audio_oss_device = strdup(/dev/dsp);
+ GlobalFDSet.audio_alsa_device = strdup(default);
+ GlobalFDSet.audio_nas_server = strdup(tcp/localhost:5450);
diff --git a/debian/init.d b/debian/init.d
index 08af0ae..0bc4f90 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:  speech-dispatcher
-# Required-Start:
-# Required-Stop: 
+# Required-Start:$remote_fs pulseaudio
+# Required-Stop: $remote_fs pulseaudio
 # Should-Start:  festival
 # Should-Stop:   festival
 # Default-Start: 2 3 4 5
diff --git a/debian/patches/00list b/debian/patches/00list
index 1cf25fa..66bc4b0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,5 @@
 04_getline.dpatch
 05_libspeechd.dpatch
 06_extlink.dpatch
+08_pulse-default.dpatch


Bug#577217: [PATCH] speech-dispatcher locks main audio pcm preventing other apps to use sound

2010-05-05 Thread Milan Zamazal
 AM == Andres Mejia mcita...@gmail.com writes:

AM Attached is a patch that updates the packaging to make
AM speech-dispatcher use pulse by default instead of alsa. The idea
AM was taken from upstream [1]. This would prevent the locking of
AM audio devices from speech-dispatcher.

I'm not sure this is a good idea, PulseAudio used to have its own
problems.  A better idea might be not to start system wide Speech
Dispatcher by default or to add a debconf option to specify how to start
Speech Dispatcher.

AM What would probably be better is to package a new version of
AM speech-dispatcher from the 0.6.8~unofficial~rc2 release
AM [2]. 

No.  According to the official Speech Dispatcher maintainer the patches
included in this release require significant cleanup work.  He now works
on it and prepares official 0.7 release which is expected to be ready
this month.  When it is released I'll package it and will fix the Debian
packaging bugs.




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org