Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 45 insertions, 21 deletions

diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 578d382e2..f1cf961e1 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pulseaudio
 PKG_VERSION:=		4.0
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		591f211db2790a7e4d222f2dc6858db3
 PKG_DESCR:=		a sound system for POSIX OSes
 PKG_SECTION:=		multimedia
@@ -46,7 +46,8 @@ CONFIGURE_ARGS+=	--disable-systemd \
 			--disable-hal-compat \
 			--enable-samplerate \
 			--enable-alsa \
-			--with-speex
+			--with-speex \
+			--with-access-group=audio
 
 pulseaudio-install:
 	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse
@@ -64,5 +65,10 @@ pulseaudio-install:
 	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
 	$(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \
 		$(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+	# pa uses $HOME from root user otherwise
+	mv $(IDIR_PULSEAUDIO)/usr/bin/pacmd $(IDIR_PULSEAUDIO)/usr/bin/pacmd.bin
+	echo "#!/bin/sh" > $(IDIR_PULSEAUDIO)/usr/bin/pacmd
+	echo 'PULSE_RUNTIME_PATH=/var/run/pulse pacmd.bin "$$@"' >> $(IDIR_PULSEAUDIO)/usr/bin/pacmd
+	chmod 755 $(IDIR_PULSEAUDIO)/usr/bin/pacmd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pulseaudio/files/daemon.conf b/package/pulseaudio/files/daemon.conf
index cfb58724d..760e5299f 100644
--- a/package/pulseaudio/files/daemon.conf
+++ b/package/pulseaudio/files/daemon.conf
@@ -1,4 +1,4 @@
-daemonize = yes
+daemonize = no
 allow-module-loading = no
 allow-exit = no
 use-pid-file = yes
@@ -8,19 +8,15 @@ fail = yes
 system-instance = yes
 enable-shm = no
 realtime-scheduling = yes
-realtime-priority = 5
+realtime-priority = 9
 resample-method = src-sinc-fastest
 exit-idle-time = -1
 load-default-script-file = yes
 default-script-file = /etc/pulse/system.pa
-log-target = syslog
-log-level = error
+log-target = stderr
+log-level = 1
 log-time = yes
-; default-sample-format = s16le
-; default-sample-rate = 44100
-; alternate-sample-rate = 48000
-; default-sample-channels = 2
-; default-channel-map = front-left,front-right
-
-; default-fragments = 4
-; default-fragment-size-msec = 25
+default-sample-rate = 44100
+resample-method = src-sinc-fastest
+default-fragments = 10                                                
+default-fragment-size-msec = 10
diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init
index f928e3fe6..584a42350 100644
--- a/package/pulseaudio/files/pulseaudio.init
+++ b/package/pulseaudio/files/pulseaudio.init
@@ -10,13 +10,17 @@ autostart)
 	exec sh $0 start
 	;;
 start)
+	# check group membership
+	id pulse | grep audio >/dev/null 2>&1
+	if [ $? -ne 0 ];then
+		echo "pulse user must be in group audio."
+		exit 1
+	fi
 	if [ ! -d /var/run/pulse ]; then 
 		mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse
 	fi
-	if [ ! -d /var/lib/pulse ]; then 
-		mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse
-	fi
-	/usr/bin/pulseaudio $pulseaudio_flags
+	chown pulse /etc/pulse
+	env PULSE_STATE_PATH=/etc/pulse/state /usr/bin/pulseaudio $pulseaudio_flags
 	;;
 stop)
 	kill $(pgrep -f /usr/bin/pulseaudio)
diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst
index 0ec666ee5..e1ef8dfd1 100644
--- a/package/pulseaudio/files/pulseaudio.postinst
+++ b/package/pulseaudio/files/pulseaudio.postinst
@@ -4,4 +4,4 @@ add_rcconf pulseaudio pulseaudio NO
 gid=$(get_next_gid)
 add_user pulse $(get_next_uid) $gid /var/run/pulse
 add_group pulse $gid
-add_rcconf pulseaudio_flags pulseaudio_flags ""
+add_rcconf pulseaudio_flags pulseaudio_flags "-D --log-target=syslog"
diff --git a/package/pulseaudio/files/system.pa b/package/pulseaudio/files/system.pa
index 035f4a6db..693db412b 100644
--- a/package/pulseaudio/files/system.pa
+++ b/package/pulseaudio/files/system.pa
@@ -22,6 +22,24 @@ load-module module-always-sink
 ### Enable positioned event sounds
 load-module module-position-event-sounds
 
-load-module module-null-sink sink_name=rtp format=s16be channels=2
-load-module module-rtp-send source=rtp.monitor destination=224.0.0.56
+# pacmd communication
+load-module module-cli-protocol-unix socket=/var/run/pulse/cli
+
+# configure as a rtp sender
+#load-module module-null-sink sink_name=rtp format=s16be channels=2
+#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56
+
+# configure as a rtp receiver and sender
+#load-module module-null-sink sink_name=rtp format=s16be channels=2
+#load-module module-rtp-send source=rtp.monitor destination=224.0.0.56 loop=1
+#load-module module-alsa-sink device=hw:0,0 sink_name=alsa
+#load-module module-rtp-recv sap_address=224.0.0.56 sink=alsa
+
+# configure combine-sink (echo in the same room)
+#load-module module-alsa-sink device=hw:0,0 sink_name=alsa
+#load-module module-combine-sink slaves=rtp,alsa
+
+# configure as a rtp receiver
+load-module module-rtp-recv sap_address=224.0.0.56
+load-module module-alsa-sink device=hw:0,0