From 71ee6ec669cb4dbc229853220234ae6aed1014f5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 8 Sep 2021 08:40:42 +1000 Subject: [PATCH] daemon: split the session-manager and pipewire-pulse comments Let them be enabled/disabled individually. --- src/daemon/meson.build | 6 ++++-- src/daemon/pipewire.conf.in | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/daemon/meson.build b/src/daemon/meson.build index a74e11eb4..a65bebd7d 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -13,7 +13,8 @@ conf_config.set('session_manager_path', pipewire_bindir / 'pipewire-media-sessio conf_config.set('session_manager_args', '') conf_config.set('pipewire_path', pipewire_bindir / 'pipewire') conf_config.set('pipewire_pulse_path', pipewire_bindir / 'pipewire-pulse') -conf_config.set('comment', '#') +conf_config.set('sm_comment', '#') +conf_config.set('pulse_comment', '#') conf_config_uninstalled = conf_config conf_config_uninstalled.set('session_manager_path', @@ -22,7 +23,8 @@ conf_config_uninstalled.set('pipewire_path', meson.build_root() / 'src' / 'daemon' / 'pipewire') conf_config_uninstalled.set('pipewire_pulse_path', meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse') -conf_config_uninstalled.set('comment', '') +conf_config_uninstalled.set('sm_comment', '') +conf_config_uninstalled.set('pulse_comment', '') build_ms = get_option('session-managers').contains('media-session') build_wp = get_option('session-managers').contains('wireplumber') diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in index 09e62e528..95632c250 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in @@ -235,12 +235,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # - @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } + @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # - @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } + @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ]