diff --git a/ChangeLog b/ChangeLog index 10f4db73..5fca4d7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18865,3 +18865,5 @@ * Added switcher support for Grass Valley Series 7000 protocol. 2019-07-16 Fred Gleason * Added an rdlogmanager(1) man page. +2019-07-16 Fred Gleason + * Added an rdairplay(1) man page. diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am index ef8b1025..c63c847e 100644 --- a/docs/manpages/Makefile.am +++ b/docs/manpages/Makefile.am @@ -31,7 +31,8 @@ %.8: %.xml xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< -all-local: rdclilogedit.1\ +all-local: rdairplay.1\ + rdclilogedit.1\ rdconvert.1\ rddbmgr.8\ rdexport.1\ @@ -43,7 +44,8 @@ all-local: rdclilogedit.1\ rmlsend.1\ rdservice.8 -man_MANS = rdclilogedit.1\ +man_MANS = rdairplay.1\ + rdclilogedit.1\ rdconvert.1\ rddbmgr.8\ rdexport.1\ @@ -55,7 +57,9 @@ man_MANS = rdclilogedit.1\ rmlsend.1\ rdservice.8 -EXTRA_DIST = rdclilogedit.1\ +EXTRA_DIST = rdairplay.1\ + rdairplay.xml\ + rdclilogedit.1\ rdclilogedit.xml\ rdconvert.1\ rdconvert.xml\ diff --git a/docs/manpages/rdairplay.xml b/docs/manpages/rdairplay.xml new file mode 100644 index 00000000..f7c4414e --- /dev/null +++ b/docs/manpages/rdairplay.xml @@ -0,0 +1,95 @@ + + + + + rdairplay + 1 + July 2019 + Linux Audio Manual + + + rdairplay + + Module for playing Rivendell logs + + + + + + Fred + Gleason + fredg@paravelsystems.com + + Application Author + + + + + + + rdairplay + log-spec=:next-line+ + + + + + Description + + Where log-spec refers to one of the three + log machines (--log1, --log2 + or --log3, referring to the + Main Log, + Aux 1 Log, + Aux 2 Log log machines, respectively) + and nextline + to the line number to do a 'make next' to after the log is loaded + (default = 0). If the + + is appended, then the log is started after the + 'make next'. + + + + Examples + + + + rdairplay --log1=MyLog + + + + Load MyLog into the Main Log machine + + + + + + rdairplay --log2=MyLog:14+ + + + + Load MyLog into the Aux Log 1 machine, + 'Make Next' to line 14 and then start the log. + + + + + + rdairplay --log1=YourLog --log2=MyLog + + + + Load YourLog into the Main Log machine + and MyLog into the Aux Log 1 machine. + + + + + + + + + diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h index da848396..8fea773e 100644 --- a/rdairplay/rdairplay.h +++ b/rdairplay/rdairplay.h @@ -2,7 +2,7 @@ // // The On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -85,7 +85,7 @@ #define METER_INTERVAL 20 #define MASTER_TIMER_INTERVAL 100 #define MESSAGE_WIDGET_WIDTH 410 -#define RDAIRPLAY_USAGE "[=[:[+]]] [...]\n\nWhere refers to one of the three log machines\n('--log1', '--log2' or '--log3') and to the line number\nto do a 'make next' to after the log is loaded (default = 0). If the\n'+' is appended, then the log is started after the 'make next'.\n\nExamples:\n rdairplay --log1=MyLog\n Load 'MyLog' into the Main Log machine\n\n rdairplay --log2=MyLog:14+\n Load 'MyLog' into the Aux Log 1 machine, 'Make Next'\n to line 14 and then start the log.\n\n rdairplay --log1=YourLog --log2=MyLog\n Load 'YourLog' into the Main Log machine and 'MyLog' into the\n Aux Log 1 machine.\n" +#define RDAIRPLAY_USAGE "[OPTIONS]\n" class MainWidget : public QWidget { diff --git a/rivendell.spec.in b/rivendell.spec.in index b2850fa5..a1e708b2 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -388,6 +388,7 @@ rm -rf $RPM_BUILD_ROOT /etc/pam.d/rddbconfig-root /etc/pam.d/rivendell /lib/systemd/system/rivendell.service +%{_mandir}/man1/rdairplay.1.gz %{_mandir}/man1/rdclilogedit.1.gz %{_mandir}/man1/rdconvert.1.gz %{_mandir}/man1/rdexport.1.gz