Changeset 958

Timestamp:

09/05/08 12:42:59 (3 months ago)

Author:

mariodebian

Message:

initramfs-tools-tcos (0.89.6)

• xmlrpc/sh/rtp-controller.sh, hooks-addons/21pulseaudio:
  • Revert creation of /etc/asound.conf in 21pulseaudio because breaks tmixer

Location:

trunk/initramfs-tools-tcos

Files:

• debian/changelog (modified) (1 diff)
• hooks-addons/21pulseaudio (modified) (1 diff)
• xmlrpc/sh/rtp-controller.sh (modified) (2 diffs)

trunk/initramfs-tools-tcos/debian/changelog

@@ -10 +10 @@
   * debian/control:
     - Add libsox-fmt-all and libasound2-plugins to tcos-core Depends
-
- -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 11:08:42 +0200
+  * xmlrpc/sh/rtp-controller.sh, hooks-addons/21pulseaudio:
+    - Revert creation of /etc/asound.conf in 21pulseaudio because breaks tmixer
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 12:38:28 +0200
 
 initramfs-tools-tcos (0.89.5) unstable; urgency=low

trunk/initramfs-tools-tcos/hooks-addons/21pulseaudio

@@ -89 +89 @@
  cpifexists /etc/pulse/client.conf     /etc/pulse/
  cpifexists /etc/pulse/daemon.conf     /etc/pulse/
-
- cat << EOF >> ${DESTDIR}/etc/asound.conf
-pcm.!default {
-    type pulse
-}
-ctl.!default {
-    type pulse
-}
-EOF
 
   mkdir -p ${DESTDIR}/usr/lib/alsa-lib/

trunk/initramfs-tools-tcos/xmlrpc/sh/rtp-controller.sh

@@ -53 +53 @@
         mkfifo /tmp/audiofifo 2>/dev/null
         if [ $STANDALONE = 0 ]; then
+             cat << EOF > /etc/asound.conf
+pcm.!default {
+    type pulse
+}
+ctl.!default {
+    type pulse
+}
+EOF
              /sbin/daemonize.sh "rtpdump" "-F payload -o /tmp/audiofifo $2/1234"
              /sbin/daemonize.sh "play" "-t raw -r 44100 -s -2 -c 2 -B /tmp/audiofifo"
@@ -65 +73 @@
             killall -SIGKILL play 2>/dev/null
             killall -SIGKILL rtpdump 2>/dev/null
-            rm -f /tmp/audiofifo
+            rm -f /tmp/audiofifo /etc/asound.conf
             if [ $? = 0 ]; then echo "ok"; else echo "error: stopping rtp play"; fi
         else