diff --git a/packages/audio/pulseaudio/config/pulseaudio-system.conf b/packages/audio/pulseaudio/config/pulseaudio-system.conf deleted file mode 100644 index c92fc53010..0000000000 --- a/packages/audio/pulseaudio/config/pulseaudio-system.conf +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/audio/pulseaudio/config/system.pa b/packages/audio/pulseaudio/config/system.pa index 445d258e95..653361e807 100644 --- a/packages/audio/pulseaudio/config/system.pa +++ b/packages/audio/pulseaudio/config/system.pa @@ -19,14 +19,12 @@ # mode. ### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif load-module module-native-protocol-unix ### Automatically restore the volume of streams and devices load-module module-stream-restore load-module module-device-restore +load-module module-card-restore ### Automatically restore the default sink/source when changed by the user ### during runtime @@ -40,9 +38,6 @@ load-module module-always-sink ### Automatically suspend sinks/sources that become idle for too long load-module module-suspend-on-idle -### Enable positioned event sounds -load-module module-position-event-sounds - ### Automatically load modules for dbus .ifexists module-dbus-protocol.so load-module module-dbus-protocol diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk index 007839628e..7835401ed8 100644 --- a/packages/audio/pulseaudio/package.mk +++ b/packages/audio/pulseaudio/package.mk @@ -80,7 +80,8 @@ post_makeinstall_target() { safe_remove ${INSTALL}/usr/share/bash-completion cp ${PKG_DIR}/config/system.pa ${INSTALL}/etc/pulse/ - cp ${PKG_DIR}/config/pulseaudio-system.conf ${INSTALL}/etc/dbus-1/system.d/ + + sed 's/user="pulse"/user="root"/' -i ${INSTALL}/etc/dbus-1/system.d/pulseaudio-system.conf mkdir -p ${INSTALL}/usr/config cp -PR ${PKG_DIR}/config/pulse-daemon.conf.d ${INSTALL}/usr/config diff --git a/packages/audio/pulseaudio/system.d/pulseaudio.service b/packages/audio/pulseaudio/system.d/pulseaudio.service index f052e019d3..1ec4269550 100644 --- a/packages/audio/pulseaudio/system.d/pulseaudio.service +++ b/packages/audio/pulseaudio/system.d/pulseaudio.service @@ -5,8 +5,10 @@ After=syslog.target local-fs.target [Service] Type=dbus BusName=org.pulseaudio.Server -ExecStart=/usr/bin/pulseaudio --system --disallow-exit --exit-idle-time=-1 --disable-shm +ExecStart=/usr/bin/pulseaudio --system --disallow-exit --exit-idle-time=-1 --disable-shm --enable-memfd --realtime Restart=on-failure +Environment=PULSE_STATE_PATH=/storage/.config/pulse +Environment=PULSE_CONFIG_PATH=/storage/.config/pulse [Install] WantedBy=multi-user.target