--- Begin Message ---
|
Subject: |
[PATCH 1/3] services: Add pulseaudio-configuration. |
|
Date: |
Thu, 9 Jan 2020 14:57:44 +0100 |
* gnu/services/sound (<pulseaudio-configuration>): New record.
(pulseaudio-etc): New procedure.
(pulseaudio-service-type): Update accordingly.
---
gnu/services/sound.scm | 47 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm
index aaca733729..f01d958ce7 100644
--- a/gnu/services/sound.scm
+++ b/gnu/services/sound.scm
@@ -34,6 +34,7 @@
#:export (alsa-configuration
alsa-service-type
+ pulseaudio-configuration
pulseaudio-service-type))
;;; Commentary:
@@ -106,19 +107,61 @@ ctl.!default {
;;; PulseAudio
;;;
+(define-record-type* <pulseaudio-configuration>
+ pulseaudio-configuration make-pulseaudio-configuration
+ pulseaudio-configuration?
+ (package pulseaudio-package (default pulseaudio))
+ (client-conf pulseaudio-client-conf (default '()))
+ (daemon-conf pulseaudio-daemon-conf (default '((flat-volumes no))))
+ (default-script pulseaudio-default-script (default #f))
+ (system-script pulseaudio-system-script (default #f)))
+
(define (pulseaudio-environment config)
;; Define this variable in the global environment such that
;; pulseaudio swh-plugins works.
`(("LADSPA_PATH"
. ,(file-append swh-plugins "/lib/ladspa"))))
+(define (pulseaudio-conf-entry arg)
+ (match arg
+ ((key value)
+ (format #f "~a = ~s~%" key value))
+ ((? string? _)
+ (string-append arg "\n"))))
+
+(define pulseaudio-etc
+ (match-lambda
+ (($ <pulseaudio-configuration> package client-conf daemon-conf
+ default-script system-script)
+ (let ((default.pa (if default-script
+ (apply mixed-text-file "default.pa"
+ default-script)
+ (file-append package "/etc/pulse/default.pa"))))
+ `(("pulse"
+ ,(file-union
+ "pulse"
+ `(("client.conf"
+ ,(apply mixed-text-file "client.conf"
+ (map pulseaudio-conf-entry client-conf)))
+ ("daemon.conf"
+ ,(apply mixed-text-file "daemon.conf"
+ "default-script-file = " default.pa "\n"
+ (map pulseaudio-conf-entry daemon-conf)))
+ ("default.pa" ,default.pa)
+ ("system.pa"
+ ,(if system-script
+ (apply mixed-text-file "system.pa"
+ system-script)
+ (file-append package "/etc/pulse/system.pa")))))))))))
+
(define pulseaudio-service-type
(service-type
(name 'pulseaudio)
(extensions
(list (service-extension session-environment-service-type
- pulseaudio-environment)))
- (default-value #f)
+ pulseaudio-environment)
+ (service-extension etc-service-type pulseaudio-etc)))
+ (default-value (pulseaudio-configuration))
(description "Configure PulseAudio sound support.")))
;;; sound.scm ends here
--
2.24.1
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#39053] [PATCH] Add pulseaudio configuration and fix volume bugs |
|
Date: |
Sat, 11 Jan 2020 18:23:26 +0100 |
|
User-agent: |
Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) |
Leo Prikler <address@hidden> writes:
> This series of patches adds a configuration type for pulseaudio and also fixes
> a bug, where various applications would inadvertently max out the system
> volume
> (see e.g. #38172).
Thanks! I've pushed the patches with mentioned tweaks in
2c7511fb6..71e33e32f.
signature.asc
Description: PGP signature
--- End Message ---