Merge pull request #1900 from fewtarius/dev

Revert variable change, switch Dolphin to pulse audio.
2023-08-10 05:45:17 -04:00 · 2023-08-10 05:45:17 -04:00 · 0201d52ac7
commit 0201d52ac7
parent 9c4f9e4f62 5537455847
16 changed files with 20 additions and 25 deletions
--- a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh
+++ b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh
@ -162,6 +162,6 @@ fi
  export QT_QPA_PLATFORM=wayland

 #Run Aethersx2 emulator
-  export SDL_AUDIODRIVER=pipewire
+  export SDL_AUDIODRIVER=pulseaudio
  jslisten set "-9 aethersx2"
  ${EMUPERF} /usr/bin/@APPIMAGE@ -fullscreen "${1}"
--- a/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh
+++ b/packages/emulators/standalone/cemu-sa/scripts/start_cemu.sh
@ -6,7 +6,8 @@
 # Source environment variables
 . /etc/profile

-export SDL_AUDIODRIVER=pipewire
+# Ensure we're using pulseaudio
+export SDL_AUDIODRIVER=pulseaudio
 jslisten set "-9 cemu"

 if [ -z "${PASINK}" ]
--- a/packages/emulators/standalone/dolphin-sa/config/AMD64/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/AMD64/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 [Input]
--- a/packages/emulators/standalone/dolphin-sa/config/RK3399/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/RK3399/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 [Input]
--- a/packages/emulators/standalone/dolphin-sa/config/RK3566-X55/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/RK3566-X55/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 [Input]
--- a/packages/emulators/standalone/dolphin-sa/config/RK3566/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/RK3566/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 [Input]
--- a/packages/emulators/standalone/dolphin-sa/config/RK3588/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/RK3588/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 [Input]
--- a/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini
+++ b/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini
@ -135,7 +135,7 @@ ShowInputDisplay = False
 EnableJIT = True
 DumpAudio = False
 DumpUCode = False
-Backend = ALSA
+Backend = Pulse
 Volume = 100
 CaptureLog = False
 DSPThread = True
--- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
+++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
@ -6,9 +6,6 @@
 . /etc/profile
 jslisten set "-9 dolphin-emu-nogui"

-systemctl stop pipewire-pulse
-export SDL_AUDIODRIVER=alsa
-
 #Check if dolphin-emu exists in .config
 if [ ! -d "/storage/.config/dolphin-emu" ]; then
    mkdir -p "/storage/.config/dolphin-emu"
@ -247,6 +244,3 @@ ln -sf /storage/.config/dolphin-emu /storage/.local/share/dolphin-emu

 #Run Dolphin emulator
 ${EMUPERF} /usr/bin/dolphin-emu-nogui -p @DOLPHIN_PLATFORM@ -a HLE -e "${1}"
-
-unset SDL_AUDIODRIVER
-systemctl start pipewire-pulse
--- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
+++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
@ -6,9 +6,6 @@
 . /etc/profile
 jslisten set "-9 dolphin-emu-nogui"

-systemctl stop pipewire-pulse
-export SDL_AUDIODRIVER=alsa
-
 #Check if dolphin-emu exists in .config
 if [ ! -d "/storage/.config/dolphin-emu" ]; then
    mkdir -p "/storage/.config/dolphin-emu"
@ -258,6 +255,3 @@ ln -sf /storage/.config/dolphin-emu /storage/.local/share/dolphin-emu

 #Run Dolphin emulator
 ${EMUPERF} /usr/bin/dolphin-emu-nogui -p @DOLPHIN_PLATFORM@ -a HLE -e "${1}"
-
-unset SDL_AUDIODRIVER
-systemctl start pipewire-pulse
--- a/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh
+++ b/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh
@ -30,7 +30,7 @@ ln -sf /storage/roms/bios/rpcs3/dev_flash /storage/.config/rpcs3/dev_flash
 	/usr/bin/rpcs3
  else
 	export QT_QPA_PLATFORM=xcb
-	export SDL_AUDIODRIVER=pipewire
+	export SDL_AUDIODRIVER=pulseaudio
        jslisten set "-9 rpcs3"
 	/usr/bin/rpcs3 --no-gui "${1}"
  fi
--- a/packages/jelos/sources/post-update
+++ b/packages/jelos/sources/post-update
@ -165,6 +165,12 @@ then
  cp -f /usr/config/flycast/emu.cfg /storage/.config/flycast/emu.cfg
 fi

+### Dolphin needs to switch to pulseaudio
+if [ -e "/storage/.config/dolphin-emu/Dolphin.ini" ]
+then
+  sed -i 's/Backend = ALSA/Backend = Pulse/g' /storage/.config/dolphin-emu/Dolphin.ini
+fi
+
 ### Set the default output to Master for pipewire
 ES_SETTINGS="/storage/.config/emulationstation/es_settings.cfg"

--- a/packages/ui/emulationstation/sources/es_settings
+++ b/packages/ui/emulationstation/sources/es_settings
@ -6,7 +6,7 @@
 # Source predefined functions and variables
 . /etc/profile

-export SDL_AUDIODRIVER=pipewire
+export SDL_AUDIODRIVER=pulseaudio

 TZ=$(get_setting system.timezone)
 echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone
--- a/packages/ui/emulationstation/sources/start_es.sh
+++ b/packages/ui/emulationstation/sources/start_es.sh
@ -6,7 +6,7 @@
 # Source predefined functions and variables
 . /etc/profile

-export SDL_AUDIODRIVER=pipewire
+export SDL_AUDIODRIVER=pulseaudio

 TZ=$(get_setting system.timezone)
 echo -n "TIMEZONE=${TZ}" > /storage/.cache/timezone
--- a/packages/ui/emulationstation/system.d/emustation.service
+++ b/packages/ui/emulationstation/system.d/emustation.service
@ -5,7 +5,7 @@ ConditionPathExists=/var/lock/start.games
 [Service]
 Environment=XDG_RUNTIME_DIR=/var/run/0-runtime-dir
 Environment=HOME=/storage
-Environment=SDL_AUDIODRIVER=pipewire
+Environment=SDL_AUDIODRIVER=pulseaudio
 ExecStartPre=/usr/bin/es_settings
 ExecStart=/usr/bin/emulationstation --log-path /var/log --no-splash
 KillMode=process
--- a/packages/wayland/weston/profile.d/04-weston.conf
+++ b/packages/wayland/weston/profile.d/04-weston.conf
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

-export SDL_AUDIODRIVER=pipewire
+export SDL_AUDIODRIVER=pulseaudio
 export SDL_VIDEODRIVER=wayland
 export WAYLAND_DISPLAY=wayland-1
 export XKB_CONFIG_ROOT=/usr/share/X11/xkb