From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 18 Nov 2007 14:29:16 +0000 (+0000)
Subject: openmoko-sound-system2:
X-Git-Tag: Release-2010-05/1~8350
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e44a7414229149bad6ff61bf466b0a87934d632;p=openembedded.git

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.
---

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