r2205 - in trunk/oe/packages/openmoko-base: . openmoko-sound-system

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-06-09 19:42:22 +0200 (Sat, 09 Jun 2007)
New Revision: 2205

Added:
   trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
Modified:
   trunk/oe/packages/openmoko-base/openmoko-sound-system/session
   trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
Log:
oe/openmoko-sound-system: add basic init script


Added: trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio	2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio	2007-06-09 17:42:22 UTC (rev 2205)
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# pulseaudio	This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# If you must specify special options, uncomment and modify the next line
+OPTS="-s 115200 -F"
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+    echo -n "Starting the audio server..."
+	pulseaudio --system -nDF /etc/share/pulseaudio/session
+	echo "success"
+}
+
+stop() {
+	# Stop daemons.
+	echo -n "Shutting down $prog: "
+	killall pulseaudio
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $RETVAL


Property changes on: trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/session	2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/session	2007-06-09 17:42:22 UTC (rev 2205)
@@ -21,9 +21,6 @@
 load-sample-lazy  /usr/share/openmoko/sounds/notify_doorbell.wav x11-bell
 load-module module-x11-bell sample=x11-bell
 
-# Load key click sample
-load-sample /usr/share/openmoko/sounds/touchscreen_click.wav
-
-# Play a welcome sound
-play-file /usr/share/openmoko/sounds/openmoko_startup.wav output
-
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/openmoko_startup.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav

Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb	2007-06-09 16:15:23 UTC (rev 2204)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb	2007-06-09 17:42:22 UTC (rev 2205)
@@ -10,16 +10,22 @@
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
 "
-PR = "r1"
+PR = "r3"
 
-inherit openmoko-base
+inherit openmoko-base update-rc.d
 
-SRC_URI = "file://session"
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+           file://session"
 S = "${WORKDIR}"
 
 do_install() {
-    install -d ${D}/${sysconfdir}/pulseaudio
-	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulseaudio/session
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+    install -d ${D}/${sysconfdir}/pulse
+	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
 }
 
 PACKAGE_ARCH = "all"