[PATCH 5/6] doc: Add pulseaudio documentation.

  • Done
  • quality assurance status badge
Details
2 participants
  • Leo Prikler
  • Marius Bakke
Owner
unassigned
Submitted by
Leo Prikler
Severity
normal
Merged with
L
L
Leo Prikler wrote on 10 Jan 2020 02:48
(address . guix-patches@gnu.org)(address . 39053@debbugs.gnu.org)
20200110014823.10595-5-leo.prikler@student.tugraz.at
* doc/guile.texi: Add documentation for pulseaudio-service-type and
pulseaudio-configuration.
---
doc/guix.texi | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)

Toggle diff (55 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 431895aa7d..05d826f6d8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -15951,6 +15951,48 @@ pcm.!default @{
See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the
details.
+@deffn {Scheme Variable} pulseaudio-service-type
+This is the type for the @uref{http://www.pulseaudio.org/, PulseAudio}
+sound server. It exists to allow system overrides of the default settings
+via @code{pulseaudio-configuration}, see below.
+
+@quotation Warning
+This service on its own does not ensure, that the @code{pulseaudio} package
+exists on your machine. It merely adds configuration files for it, as
+detailed below. In the (admittedly unlikely) case, that you find yourself
+without a @code{pulseaudio} package, consider enabling it through the
+@code{alsa-service-type} above.
+@end quotation
+@end deffn
+
+@deftp {Data Type} pulseaudio-configuration
+Data type representing the configuration for @code{pulseaudio-service}.
+
+@table @asis
+@item @code{client-conf} (default: @var{()})
+List of settings to set in @file{client.conf}.
+Accepts a list of strings or a symbol-value pairs. A string will be
+inserted as-is with a newline added. A pair will be formatted as
+``key = value'', again with a newline added.
+
+@item @code{daemon-conf} (default: @var{((flat-volumes . no))})
+List of settings to set in @file{daemon.conf}, formatted just like
+@code{client-conf}.
+
+In addition to the above, @code{default-script-file} will be set to the
+value of @code{script-file}. By default, @var{flat-volumes} is set to
+``no'', so as to avoid bugs related to this feature.
+
+@item @code{script-file}
+Script file to use as as @file{default.pa}. Defaults to the one included by
+the @code{pulseaudio} package.
+
+@item @code{system-script-file}
+Script file to use as as @file{system.pa}. Defaults to the one included by
+the @code{pulseaudio} package.
+@end table
+@end deftp
+
@deffn {Scheme Variable} ladspa-service-type
This service sets the @var{LADSPA_PATH} variable, so that programs, which
respect it, e.g. PulseAudio, can load LADSPA plugins.
--
2.24.1
M
M
Marius Bakke wrote on 11 Jan 2020 17:54
(address . control@debbugs.gnu.org)
87v9piyluy.fsf@devup.no
merge 39053 39052 39054 39055 39062 39061 39063 39065 39064
thanks
M
M
Marius Bakke wrote on 11 Jan 2020 18:09
(address . 39053@debbugs.gnu.org)
87lfqdzzrj.fsf@devup.no
Leo Prikler <leo.prikler@student.tugraz.at> writes:

Toggle quote (3 lines)
> * doc/guile.texi: Add documentation for pulseaudio-service-type and
> pulseaudio-configuration.

Ideally this would have been squashed with the first commit, but then
we'd have to move ladspa-service-type first, so I kept it as a
standalone commit. I also added a copyright notice for you.

[...]

Toggle quote (18 lines)
> +@deftp {Data Type} pulseaudio-configuration
> +Data type representing the configuration for @code{pulseaudio-service}.
> +
> +@table @asis
> +@item @code{client-conf} (default: @var{()})
> +List of settings to set in @file{client.conf}.
> +Accepts a list of strings or a symbol-value pairs. A string will be
> +inserted as-is with a newline added. A pair will be formatted as
> +``key = value'', again with a newline added.
> +
> +@item @code{daemon-conf} (default: @var{((flat-volumes . no))})
> +List of settings to set in @file{daemon.conf}, formatted just like
> +@code{client-conf}.
> +
> +In addition to the above, @code{default-script-file} will be set to the
> +value of @code{script-file}. By default, @var{flat-volumes} is set to
> +``no'', so as to avoid bugs related to this feature.

The first sentence of this paragraph is obsolete, no? The second is
rather vague, so I opted to remove the whole thing. Let me know if you
think something should be added!

Toggle quote (10 lines)
> +@item @code{script-file}
> +Script file to use as as @file{default.pa}. Defaults to the one included by
> +the @code{pulseaudio} package.
> +
> +@item @code{system-script-file}
> +Script file to use as as @file{system.pa}. Defaults to the one included by
> +the @code{pulseaudio} package.
> +@end table
> +@end deftp

I added a (default: ...) on these two and removed the related sentences.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4aATAACgkQoqBt8qM6
VPoQTQgAn8DBF84APhAhp61pIepSX7k5zqpjrI5O6jUmOEo+JpBTxZLRIqrooliX
mDnOEqtTri6HWaRfbAkPqgQY7fwHEDHVoZ2lYgfudV5YbIdJl7xCrJFgubSNZLwg
jXqNIJyNWfxaNpD2nN3IEcZytdvfMuXgRS62Xa/CDDDIpBMa9YRMHWmj0YejnX3U
tLMhi8ev0/BF7ZwEpkH2LpToySyC4G4xFdJkaF1ZGowUJn10wC5kUCJH30sy9s1/
VE8SXj8BQzZvLBLpN/qY2psFpUNMBr/E+jxfoG/eJRVbILyOExT918ciCbtDPXOB
/SBOgPkU0YkUsylHbbbNLMTi0M2ywQ==
=r81Q
-----END PGP SIGNATURE-----

M
M
Marius Bakke wrote on 11 Jan 2020 18:25
(address . 39053@debbugs.gnu.org)
87d0bpzyzp.fsf@devup.no
Marius Bakke <mbakke@fastmail.com> writes:

Toggle quote (12 lines)
>> +@item @code{script-file}
>> +Script file to use as as @file{default.pa}. Defaults to the one included by
>> +the @code{pulseaudio} package.
>> +
>> +@item @code{system-script-file}
>> +Script file to use as as @file{system.pa}. Defaults to the one included by
>> +the @code{pulseaudio} package.
>> +@end table
>> +@end deftp
>
> I added a (default: ...) on these two and removed the related sentences.

I also changed to @var{...} instead of @code{...} for the options; and
used @code{...} instead of @var{...} on the defaults after reading the
generated HTML.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4aBRoACgkQoqBt8qM6
VPrvjQgAvzpkKm7WDZ8LV3iRnUMljRWSdsNmHSlHTRDLt0NU95qFU/OhjfiQ2PHy
dVcipb/+0H7RgZRbHSh20a5xWx4oMuoPH8BVoTeglyHc7kCZbLcNCCkYVWfb8kdS
ly2axHGqakUU5QsAczy7tmCnZFj4xjgfC4xkYxH6FwLVMa2Fel74fqOADc9dVeTW
RpDVxyYfMjkmaym5XNNFlMox3O7qMVZaF/XSY5oKUiFUoBB9DfgkRabbP9+k013m
jklPRg8b7I6gTKvOYpObDhNq8TKBXdFki5NoSFPGxh22lpnAxDPWAsfZ2fqVeuEP
OsFpixv5WeRkSKVekQ9dnng8H7UxHA==
=HhJZ
-----END PGP SIGNATURE-----

?