mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-08 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: split the session-manager and pipewire-pulse comments

Browse source 
Let them be enabled/disabled individually.
This commit is contained in:
Peter Hutterer 2021-09-08 08:40:42 +10:00 • committed by Wim Taymans
parent bc2d820b6d
commit 71ee6ec669
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/meson.build
View file

@ -13,7 +13,8 @@ conf_config.set('session_manager_path', pipewire_bindir / 'pipewire-media-sessio
conf_config.set('session_manager_args', '') conf_config.set('session_manager_args', '')
conf_config.set('pipewire_path', pipewire_bindir / 'pipewire') conf_config.set('pipewire_path', pipewire_bindir / 'pipewire')
conf_config.set('pipewire_pulse_path', pipewire_bindir / 'pipewire-pulse') 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 = conf_config
conf_config_uninstalled.set('session_manager_path', conf_config_uninstalled.set('session_manager_path',
@ -22,7 +23,8 @@ conf_config_uninstalled.set('pipewire_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire') meson.build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path', conf_config_uninstalled.set('pipewire_pulse_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse') 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_ms = get_option('session-managers').contains('media-session')
build_wp = get_option('session-managers').contains('wireplumber') build_wp = get_option('session-managers').contains('wireplumber')

4
src/daemon/pipewire.conf.in
View file

@ -235,12 +235,12 @@ context.exec = [
# but it is better to start it as a systemd service. # but it is better to start it as a systemd service.
# Run the session manager with -h for options. # 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 # You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service. # but it is better to start it as a systemd service.
# It can be interesting to start another daemon here that listens # It can be interesting to start another daemon here that listens
# on another address with the -a option (eg. -a tcp:4713). # 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" }
] ]