From 14e59bd977de1d1b92558d67d2216e5211f65c1e Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 7 Oct 2021 11:55:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media-plugins/alsa-plugins/51-pulseaudio-probe.conf | 2 +- .../1-merge/kde-apps/kmix/kmix_autostart.desktop | 2 +- .../1-merge/kde-apps/kmix/restore_kmix_volumes.desktop | 2 +- .../1-merge/media-sound/volumeicon/volumeicon.desktop | 2 +- .../media-sound/volumeicon/volumeicon.desktop.remove | 2 +- .../1-merge/media-video/pipewire/99-pipewire-default.conf | 2 +- .../1-merge/media-video/pipewire/pipewire.desktop | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/profiles/templates/3.6/2_ac_install_merge/media-plugins/alsa-plugins/51-pulseaudio-probe.conf b/profiles/templates/3.6/2_ac_install_merge/media-plugins/alsa-plugins/51-pulseaudio-probe.conf index a01c9d90b..8a976290f 100644 --- a/profiles/templates/3.6/2_ac_install_merge/media-plugins/alsa-plugins/51-pulseaudio-probe.conf +++ b/profiles/templates/3.6/2_ac_install_merge/media-plugins/alsa-plugins/51-pulseaudio-probe.conf @@ -1 +1 @@ -# Calculate path=/etc/alsa/conf.d link=/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf symbolic os_audio==pipewire +# Calculate path=/etc/alsa/conf.d link=/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf symbolic os_audio!=alsa diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_autostart.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_autostart.desktop index 7bebe1c7f..b1ea17e22 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_autostart.desktop +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_autostart.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde path=/etc/xdg/autostart os_audio==pipewire +# Calculate format=kde path=/etc/xdg/autostart os_audio!=alsa [Desktop Entry] X-KDE-autostart-after=pipewire diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/restore_kmix_volumes.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/restore_kmix_volumes.desktop index 7bebe1c7f..b1ea17e22 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/restore_kmix_volumes.desktop +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/restore_kmix_volumes.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde path=/etc/xdg/autostart os_audio==pipewire +# Calculate format=kde path=/etc/xdg/autostart os_audio!=alsa [Desktop Entry] X-KDE-autostart-after=pipewire diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop index 00c49811d..35d74b2df 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde path=/etc/xdg/autostart os_audio!=pipewire||pkg(media-sound/pavucontrol)!= +# Calculate format=kde path=/etc/xdg/autostart os_audio==alsa||pkg(media-sound/pavucontrol)!= [Desktop Entry] Name=VolumeIcon diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.remove index a925e9f57..3173c2474 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.remove +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.remove @@ -1 +1 @@ -# Calculate name=volumeicon.desktop path=/etc/xdg/autostart append=remove os_audio==pipewire&&pkg(media-sound/pavucontrol)== +# Calculate name=volumeicon.desktop path=/etc/xdg/autostart append=remove os_audio!=alsa&&pkg(media-sound/pavucontrol)== diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf index b7c90c434..51988e617 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf @@ -1,2 +1,2 @@ -# Calculate path=/etc/alsa/conf.d link=/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf mirror os_audio==pipewire +# Calculate path=/etc/alsa/conf.d link=/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf mirror os_audio!=alsa diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop index 550806314..b412fe3fc 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop @@ -1,9 +1,9 @@ # Calculate format=kde path=/etc/xdg/autostart [Desktop Entry] -#?os_audio==pipewire# -!Hidden= -!OnlyShowIn= -#!os_audio# +#?os_audio==alsa# Hidden=true OnlyShowIn= +#!os_audio# +!Hidden= +!OnlyShowIn= #os_audio#