Relates to <https://issues.guix.gnu.org/63082>.
* gnu/services/audio.scm (mpd-output) [mixer-type]: Change default value from
"none" to unspecified.
* doc/guix.texi (Audio Services): Regenerate doc.
---
doc/guix.texi | 11 +++++++----
gnu/services/audio.scm | 15 +++++++++------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index cdc1f4dedc..0981aa1568 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -33739,8 +33739,9 @@ Audio Services
@end table
@end deftp
+@c %start of fragment
@deftp {Data Type} mpd-output
-Data type representing a @command{mpd} audio output.
+Available @code{mpd-output} fields are:
@table @asis
@item @code{name} (default: @code{"MPD"}) (type: string)
@@ -33767,15 +33768,16 @@ Audio Services
@item @code{always-on?} (default: @code{#f}) (type: boolean)
If set to @code{#t}, then MPD attempts to keep this audio output always
-open. This may be useful for streaming servers, when you don?t want to
+open. This may be useful for streaming servers, when you don’t want to
disconnect all listeners even when playback is accidentally stopped.
-@item @code{mixer-type} (default: @code{"none"}) (type: string)
+@item @code{mixer-type} (type: maybe-string)
This field accepts a string that specifies which mixer should be used
for this audio output: the @code{hardware} mixer, the @code{software}
mixer, the @code{null} mixer (allows setting the volume, but with no
effect; this can be used as a trick to implement an external mixer
-External Mixer) or no mixer (@code{none}).
+External Mixer) or no mixer (@code{none}). When left unspecified, a
+@code{hardware} mixer is used for devices that support it.
@item @code{replay-gain-handler} (type: maybe-string)
This field accepts a string that specifies how
@@ -33790,6 +33792,7 @@ Audio Services
@end table
@end deftp
+@c %end of fragment
The following example shows a configuration of @command{mpd} that
configures some of its plugins and provides a HTTP audio streaming output.
diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm
index 7040a63ecd..1e0a8b7f9e 100644
--- a/gnu/services/audio.scm
+++ b/gnu/services/audio.scm
@@ -346,15 +346,18 @@ (define-configuration mpd-output
disconnect all listeners even when playback is accidentally stopped.")
(mixer-type
- (string "none")
- "This field accepts a string that specifies which mixer should be used
-for this audio output: the @code{hardware} mixer, the @code{software}
-mixer, the @code{null} mixer (allows setting the volume, but with no
-effect; this can be used as a trick to implement an external mixer
-External Mixer) or no mixer (@code{none})."
+ maybe-string
+ "This field accepts a string that specifies which mixer should be used for
+this audio output: the @code{hardware} mixer, the @code{software} mixer, the
+@code{null} mixer (allows setting the volume, but with no effect; this can be
+used as a trick to implement an external mixer External Mixer) or no
+mixer (@code{none}). When left unspecified, a @code{hardware} mixer is used
+for devices that support it."
(sanitizer
(lambda (x) ; TODO: deprecated, remove me later.
(cond
+ ((eq? %unset-value x)
+ x)
((symbol? x)
(warning (G_ "symbol value for 'mixer-type' is deprecated, \
use string instead~%"))
--
2.39.2
