Start media-session and pulse-server in uninstalled config

Also update the INSTALL instructions to match reality.
This commit is contained in:
Wim Taymans 2021-02-25 07:00:56 +01:00
parent eacda22a7b
commit 7cf07da392
3 changed files with 22 additions and 5 deletions

View file

@ -59,7 +59,7 @@ make run
This will use the default config file to configure and start the daemon.
The default config will also start pipewire-media-session, a default
example media session.
example media session and pipewire-pulse, a PulseAudio compatible server.
You can also enable more debugging with the PIPEWIRE_DEBUG environment
variable like so:
@ -74,6 +74,9 @@ started already, with:
```
systemctl --user stop pipewire.service
systemctl --user stop pipewire.socket
systemctl --user stop pipewire-media-session.service
systemctl --user stop pipewire-pulse.service
systemctl --user stop pipewire-pulse.socket
```
## Installing
@ -100,6 +103,18 @@ Configuration of the PipeWire daemon can be found in
/etc/pipewire/pipewire.conf. Please refer to the comments in the
config file for more information about the configuration options.
The daemon is started with:
```
systemctl --user start pipewire.service
systemctl --user start pipewire.socket
```
If you did not start the media-session in pipewire.conf, you will
also need to start it like this:
```
systemctl --user start pipewire-media-session.service
```
### ALSA plugin
The ALSA plugin is usually installed in:
@ -182,8 +197,8 @@ The server can be started with provided systemd activation files or
from PipeWire itself. (See `/etc/pipewire/pipewire.conf`)
```
systemctl --user stop pipewire-pulse.service
systemctl --user stop pipewire-pulse.socket
systemctl --user start pipewire-pulse.service
systemctl --user start pipewire-pulse.socket
```
You can also start additional PulseAudio servers listening on other

View file

@ -13,6 +13,7 @@ conf_config.set('VERSION', '"@0@"'.format(pipewire_version))
conf_config.set('media_session_path', join_paths(pipewire_bindir, 'pipewire-media-session'))
conf_config.set('pipewire_path', join_paths(pipewire_bindir, 'pipewire'))
conf_config.set('pipewire_pulse_path', join_paths(pipewire_bindir, 'pipewire-pulse'))
conf_config.set('comment', '#')
conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
conf_config_uninstalled = conf_config
@ -22,6 +23,7 @@ conf_config_uninstalled.set('pipewire_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire'))
conf_config_uninstalled.set('pipewire_pulse_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire-pulse'))
conf_config_uninstalled.set('comment', '')
conf_files = [

View file

@ -203,12 +203,12 @@ context.exec = {
# but it is better to start it as a systemd service.
# Run the session manager with -h for options.
#
#"@media_session_path@" = { args = "" }
@comment@"@media_session_path@" = { 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).
#
#"@pipewire_path@" = { args = "-c pipewire-pulse.conf" }
@comment@"@pipewire_path@" = { args = "-c pipewire-pulse.conf" }
}