diff --git a/ChangeLog b/ChangeLog index 0bae73b3..7745653e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18965,3 +18965,5 @@ 2019-08-26 Fred Gleason * Reimplemented the '--autogen' directive in rdalsaconfig(8). * Added a '--rewrite' directive in rdalsaconfig(8). +2019-08-26 Fred Gleason + * Added an rdalsaconfig(1) man page. diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am index c63c847e..d015072b 100644 --- a/docs/manpages/Makefile.am +++ b/docs/manpages/Makefile.am @@ -32,6 +32,7 @@ xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< all-local: rdairplay.1\ + rdalsaconfig.1\ rdclilogedit.1\ rdconvert.1\ rddbmgr.8\ @@ -45,6 +46,7 @@ all-local: rdairplay.1\ rdservice.8 man_MANS = rdairplay.1\ + rdalsaconfig.1\ rdclilogedit.1\ rdconvert.1\ rddbmgr.8\ @@ -59,6 +61,8 @@ man_MANS = rdairplay.1\ EXTRA_DIST = rdairplay.1\ rdairplay.xml\ + rdalsaconfig.1\ + rdalsaconfig.xml\ rdclilogedit.1\ rdclilogedit.xml\ rdconvert.1\ diff --git a/docs/manpages/rdalsaconfig.xml b/docs/manpages/rdalsaconfig.xml new file mode 100644 index 00000000..70d1fdd1 --- /dev/null +++ b/docs/manpages/rdalsaconfig.xml @@ -0,0 +1,106 @@ + + + + + rdalsaconfig + 1 + August 2019 + Linux Audio Manual + + + rdalsaconfig + + Utility for managing Rivendell ALSA configuration + + + + + + Fred + Gleason + fredg@paravelsystems.com + + Application Author + + + + + + + rdalsaconfig + options + + + + + Description + + When invoked with no options, + rdalsaconfig1 will + query the system for the list of available ALSA PCM devices and + display the results in a GUI applet, with the device(s) currently + configured for use by Rivendell highlighted. The user may select and/or + deselect devices for Rivendell and save the result. + + + + Options + + + + + + + + Load and save the Rivendell configuration file from + filename. Default value is + /etc/asound.conf. + + + + + + + + + + Generate and save a Rivendell configuration containing all + available ALSA PCM devices, then exit. This option is mutually + exclusive with the --rewrite option (see below). + + + + + + + + + + Restart the Rivendell service as necessary to make configuration + changes active (requires root permission). + + + + + + + + + + Load the current Rivendell configuration, save it back to the + same location, then exit (useful for upgrading an existing v2.x + configuration to the enhanced v3.x format). This option is mutually + exclusive with the --autogen option (see above). + + + + + + + + + diff --git a/rivendell.spec.in b/rivendell.spec.in index a1e708b2..664bff1c 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -389,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT /etc/pam.d/rivendell /lib/systemd/system/rivendell.service %{_mandir}/man1/rdairplay.1.gz +%{_mandir}/man1/rdalsaconfig.1.gz %{_mandir}/man1/rdclilogedit.1.gz %{_mandir}/man1/rdconvert.1.gz %{_mandir}/man1/rdexport.1.gz diff --git a/utils/rdalsaconfig/rdalsaconfig.h b/utils/rdalsaconfig/rdalsaconfig.h index aee87a8f..a9be0cfd 100644 --- a/utils/rdalsaconfig/rdalsaconfig.h +++ b/utils/rdalsaconfig/rdalsaconfig.h @@ -30,7 +30,7 @@ #include #include "rdalsamodel.h" -#define RDALSACONFIG_USAGE "[--asoundrc-file=] [--autogen] [--manage-daemons]\n\nGenerate an ALSA sound card configuration for Rivendell.\n\nThe following options are available:\n\n --asoundrc-file=\n Read and write configuration from (default value \n \"/etc/asound.conf\").\n\n --autogen\n Generate and save a configuration containing all available PCM devices\n and then exit.\n\n --manage-daemons\n Restart the Rivendell daemons as necessary to make configuration\n changes active (requires root permission).\n\n" +#define RDALSACONFIG_USAGE "[options]\n" void StopDaemons(); void StartDaemons();