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

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-06-10 12:43:56 +0200 (Sun, 10 Jun 2007)
New Revision: 2207

Modified:
   trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
   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: correct some paths to make pulseaudio startup as daemon


Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio	2007-06-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/pulseaudio	2007-06-10 10:43:56 UTC (rev 2207)
@@ -6,9 +6,6 @@
 # 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
 
@@ -17,14 +14,16 @@
 
 start() {
     echo -n "Starting the audio server..."
-	pulseaudio --system -nDF /etc/share/pulseaudio/session
-	echo "success"
+    # FIXME once alsa/shm permissions have been fixed, supply --system
+	pulseaudio -D -nF /etc/pulse/session
+	echo $prog
 }
 
 stop() {
 	# Stop daemons.
 	echo -n "Shutting down $prog: "
 	killall pulseaudio
+    echo "done"
 }
 
 # See how we were called.

Modified: trunk/oe/packages/openmoko-base/openmoko-sound-system/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-sound-system/session	2007-06-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system/session	2007-06-10 10:43:56 UTC (rev 2207)
@@ -1,4 +1,4 @@
-#!/usr/bin/pulseaudio -nDF
+#!/usr/bin/pulseaudio -nF
 
 # Create autoload entries for the device drivers
 add-autoload-sink output module-alsa-sink sink_name=output
@@ -18,9 +18,9 @@
 .nofail
 
 # Load an audio to the sample cache for usage with module-x11-bell
-load-sample-lazy  /usr/share/openmoko/sounds/notify_doorbell.wav x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
 load-module module-x11-bell sample=x11-bell
 
 # Load samples
-load-sample startup /usr/share/openmoko/sounds/openmoko_startup.wav
+load-sample startup /usr/share/openmoko/sounds/startup_openmoko.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-10 10:38:21 UTC (rev 2206)
+++ trunk/oe/packages/openmoko-base/openmoko-sound-system_0.1.0.bb	2007-06-10 10:43:56 UTC (rev 2207)
@@ -10,7 +10,7 @@
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
 "
-PR = "r3"
+PR = "r4"
 
 inherit openmoko-base update-rc.d