From 36fc553be598c0bb301c8027e3722fb618f29659 Mon Sep 17 00:00:00 2001 From: HikariKnight <2557889+HikariKnight@users.noreply.github.com> Date: Fri, 16 Feb 2024 08:58:04 +0100 Subject: [PATCH] fix(just): apply correct playback props for virtual channels when on deck image a valve update added virtual sink and filter chain which messes up default outputs for the old config --- .../share/ublue-os/just/83-bazzite-audio.just | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/83-bazzite-audio.just b/system_files/desktop/shared/usr/share/ublue-os/just/83-bazzite-audio.just index d959f99d..91c279a1 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/83-bazzite-audio.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/83-bazzite-audio.just @@ -3,8 +3,21 @@ # Add virtual audio channels/sinks named Game, Voice, Browser and Music which you can split audio to using qpwgraph, helvum, carla or other pipewire patchbays for use in OBS and other use cases setup-virtual-channels: #!/bin/bash + source /usr/lib/ujust/ujust.sh + IMAGE_INFO="/usr/share/ublue-os/image-info.json" + IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) + # Set default props + PROPS='node.name = "playback.game_output" + audio.position = [ FL FR ] + node.passive = true' + if [[ "$IMAGE_NAME" =~ deck ]]; then + PROPS='node.name = "playback.game_output" + audio.position = [ FL FR ] + node.passive = true + target.object = "input.virtual-sink"' + fi mkdir -p ~/.config/pipewire/pipewire.conf.d - bash -c 'cat << EOL > ~/.config/pipewire/pipewire.conf.d/virtual-channels.conf + PLAYBACK_PROPS=$PROPS bash -c 'cat << EOL > ~/.config/pipewire/pipewire.conf.d/virtual-channels.conf context.modules = [ { name = libpipewire-module-loopback args = { @@ -15,9 +28,7 @@ setup-virtual-channels: audio.position = [ FL FR ] } playback.props = { - node.name = "playback.game_output" - audio.position = [ FL FR ] - node.passive = true + $PLAYBACK_PROPS } } } @@ -30,9 +41,7 @@ setup-virtual-channels: audio.position = [ FL FR ] } playback.props = { - node.name = "playback.voice_output" - audio.position = [ FL FR ] - node.passive = true + $PLAYBACK_PROPS } } } @@ -45,9 +54,7 @@ setup-virtual-channels: audio.position = [ FL FR ] } playback.props = { - node.name = "playback.browser_output" - audio.position = [ FL FR ] - node.passive = true + $PLAYBACK_PROPS } } } @@ -60,9 +67,7 @@ setup-virtual-channels: audio.position = [ FL FR ] } playback.props = { - node.name = "playback.music_output" - audio.position = [ FL FR ] - node.passive = true + $PLAYBACK_PROPS } } }