Merge pull request #163130 from xlambein/master

pipewire-media-session: changed options to take defaults from JSON
This commit is contained in:
Lassulus 2022-04-18 19:55:31 +01:00 committed by GitHub
commit cae8c76a9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -58,7 +58,7 @@ in {
Configuration for the media session core. For details see Configuration for the media session core. For details see
https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
''; '';
default = {}; default = defaults.media-session;
}; };
alsa-monitor = mkOption { alsa-monitor = mkOption {
@ -67,7 +67,7 @@ in {
Configuration for the alsa monitor. For details see Configuration for the alsa monitor. For details see
https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
''; '';
default = {}; default = defaults.alsa-monitor;
}; };
bluez-monitor = mkOption { bluez-monitor = mkOption {
@ -76,7 +76,7 @@ in {
Configuration for the bluez5 monitor. For details see Configuration for the bluez5 monitor. For details see
https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
''; '';
default = {}; default = defaults.bluez-monitor;
}; };
v4l2-monitor = mkOption { v4l2-monitor = mkOption {
@ -85,7 +85,7 @@ in {
Configuration for the V4L2 monitor. For details see Configuration for the V4L2 monitor. For details see
https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
''; '';
default = {}; default = defaults.v4l2-monitor;
}; };
}; };
}; };