From c6ccb39b13d64cc434690c4a8ef265798d193171 Mon Sep 17 00:00:00 2001 From: "Josh.5" Date: Sun, 2 Oct 2022 06:47:06 +0000 Subject: [PATCH] Set the pulse audio socket to a more standard path This path is easily shared with other containers --- overlay/etc/cont-init.d/50-configure_pulseaudio.sh | 6 ++++-- overlay/etc/supervisor.d/vnc-audio.ini | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/overlay/etc/cont-init.d/50-configure_pulseaudio.sh b/overlay/etc/cont-init.d/50-configure_pulseaudio.sh index cba167f..1550a72 100644 --- a/overlay/etc/cont-init.d/50-configure_pulseaudio.sh +++ b/overlay/etc/cont-init.d/50-configure_pulseaudio.sh @@ -9,8 +9,10 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then sed -i 's|^; flat-volumes.*$|flat-volumes = yes|' /etc/pulse/daemon.conf else echo "Configure pulseaudio to pipe audio to a socket" - sed -i 's|^; default-server.*$|default-server = unix:/tmp/pulseaudio.socket|' /etc/pulse/client.conf - sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1|' \ + mkdir -p /tmp/pulse + chmod -R a+rw /tmp/pulse + sed -i 's|^; default-server.*$|default-server = unix:/tmp/pulse/pulse-socket|' /etc/pulse/client.conf + sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=/tmp/pulse/pulse-socket auth-anonymous=1|' \ /etc/pulse/default.pa fi chown -R ${USER} /etc/pulse diff --git a/overlay/etc/supervisor.d/vnc-audio.ini b/overlay/etc/supervisor.d/vnc-audio.ini index cb61a80..a6fbdbb 100644 --- a/overlay/etc/supervisor.d/vnc-audio.ini +++ b/overlay/etc/supervisor.d/vnc-audio.ini @@ -4,7 +4,7 @@ autostart=false autorestart=true priority=10 user=%(ENV_USER)s -command=tcpserver 127.0.0.1 %(ENV_PORT_AUDIO_STREAM)s gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 +command=tcpserver 127.0.0.1 %(ENV_PORT_AUDIO_STREAM)s gst-launch-1.0 -q pulsesrc server=/tmp/pulse/pulse-socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 stopsignal=INT stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.log stdout_logfile_maxbytes=10MB