summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-11-18 14:29:16 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-11-18 14:29:16 +0000
commit7e44a7414229149bad6ff61bf466b0a87934d632 (patch)
treec3625e6fd2f6ae6459a1b52bcb4ba823a9bfa47f
parent08ecde71ca7eae9a678363c357807a50fe71fe23 (diff)
openmoko-sound-system2:
* supply --no-cpu-limit to pulseaudio to prevent shutting down on overload (which is more likely to happen on embedded systems). closes OM #1010 - thanks Robert Schuster. * rework start script to use startstopdaemon. closes OM #785 - thanks Kristian Mueller.
-rwxr-xr-xpackages/openmoko2/openmoko-sound-system2/pulseaudio18
-rw-r--r--packages/openmoko2/openmoko-sound-system2_0.1.0.bb2
2 files changed, 12 insertions, 8 deletions
diff --git a/packages/openmoko2/openmoko-sound-system2/pulseaudio b/packages/openmoko2/openmoko-sound-system2/pulseaudio
index 76daacd3ae..964947376e 100755
--- a/packages/openmoko2/openmoko-sound-system2/pulseaudio
+++ b/packages/openmoko2/openmoko-sound-system2/pulseaudio
@@ -13,17 +13,21 @@ RETVAL=0
prog="pulseaudio"
start() {
- echo -n "Starting the audio server..."
+ echo -n "Starting audio server: "
# FIXME once alsa/shm permissions have been fixed, supply --system
- pulseaudio --resample-method=trivial -D -nF /etc/pulse/session
- echo $prog
+ start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
+
+ if [ $? = 0 ]; then
+ echo "$prog (warning ignores)." # FIXME remove comment on warning
+ else
+ echo "(failed.)"
+ fi
}
stop() {
- # Stop daemons.
- echo -n "Shutting down $prog: "
- killall pulseaudio
- echo "done"
+ echo -n "Stopping audio server: "
+ start-stop-daemon -K -x /usr/bin/pulseaudio
+ echo "pulseaudio."
}
# See how we were called.
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index e77561c3a1..29d0cba1fe 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -13,7 +13,7 @@ RDEPENDS = "\
"
RREPLACES = "openmoko-sound-system"
RPROVIDES = "openmoko-sound-system"
-PR = "r3"
+PR = "r4"
inherit openmoko-base update-rc.d