me
/
guix
Archived
1
0
Fork 0
Code

services: mpd: Auto-detect mpd-output mixer type by default. 

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.
Maxim Cournoyer 2023-04-27 16:10:20 -04:00
parent 03795e2ba2
commit 07bb69d52c
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/guix.texi
View File

@ -34417,8 +34417,9 @@ Partitions} for available options.
@end table @end table
@end deftp @end deftp
@c %start of fragment
@deftp {Data Type} mpd-output @deftp {Data Type} mpd-output
Data type representing a @command{mpd} audio output. Available @code{mpd-output} fields are:
@table @asis @table @asis
@item @code{name} (default: @code{"MPD"}) (type: string) @item @code{name} (default: @code{"MPD"}) (type: string)
@ -34445,15 +34446,16 @@ is only useful for output plugins that can receive tags, for example the
@item @code{always-on?} (default: @code{#f}) (type: boolean) @item @code{always-on?} (default: @code{#f}) (type: boolean)
If set to @code{#t}, then MPD attempts to keep this audio output always 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. 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 This field accepts a string that specifies which mixer should be used
for this audio output: the @code{hardware} mixer, the @code{software} for this audio output: the @code{hardware} mixer, the @code{software}
mixer, the @code{null} mixer (allows setting the volume, but with no 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 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) @item @code{replay-gain-handler} (type: maybe-string)
This field accepts a string that specifies how This field accepts a string that specifies how
@ -34468,6 +34470,7 @@ appended to the audio output configuration.
@end table @end table
@end deftp @end deftp
@c %end of fragment
The following example shows a configuration of @command{mpd} that The following example shows a configuration of @command{mpd} that
configures some of its plugins and provides a HTTP audio streaming output. configures some of its plugins and provides a HTTP audio streaming output.

15
gnu/services/audio.scm
View File

@ -362,15 +362,18 @@ open. This may be useful for streaming servers, when you don’t want to
disconnect all listeners even when playback is accidentally stopped.") disconnect all listeners even when playback is accidentally stopped.")
(mixer-type (mixer-type
(string "none") maybe-string
"This field accepts a string that specifies which mixer should be used "This field accepts a string that specifies which mixer should be used for
for this audio output: the @code{hardware} mixer, the @code{software} this audio output: the @code{hardware} mixer, the @code{software} mixer, the
mixer, the @code{null} mixer (allows setting the volume, but with no @code{null} mixer (allows setting the volume, but with no effect; this can be
effect; this can be used as a trick to implement an external mixer used as a trick to implement an external mixer External Mixer) or no
External Mixer) or no mixer (@code{none})." mixer (@code{none}). When left unspecified, a @code{hardware} mixer is used
for devices that support it."
(sanitizer (sanitizer
(lambda (x) ; TODO: deprecated, remove me later. (lambda (x) ; TODO: deprecated, remove me later.
(cond (cond
((eq? %unset-value x)
x)
((symbol? x) ((symbol? x)
(warning (G_ "symbol value for 'mixer-type' is deprecated, \ (warning (G_ "symbol value for 'mixer-type' is deprecated, \
use string instead~%")) use string instead~%"))