diff --git a/ChangeLog b/ChangeLog index c4fe7765..6843edc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16276,3 +16276,8 @@ 2017-11-06 Fred Gleason * Moved the contents of 'docs/WINGS_FILTER.txt' to the Operation Guide. +2017-11-07 Fred Gleason + * Removed 'docs/NOW+NEXT.txt'. + * Removed 'docs/WIN32.txt'. + * Removed 'docs/copy_split_format.odt'. + * Moved remaining unformatted notes to 'docs/misc/. diff --git a/conf/Makefile.am b/conf/Makefile.am index 358171e2..9ef5488a 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -30,7 +30,8 @@ uninstall: rm -f $(DESTDIR)/$(sysconfdir)/rd-bin.conf rm -f $(DESTDIR)/etc/pam.d/rivendell -EXTRA_DIST = my.cnf-master\ +EXTRA_DIST = asound.conf-sample\ + my.cnf-master\ my.cnf-standby\ rd-bin.conf.in\ rd.conf-sample\ diff --git a/docs/asound.conf-sample b/conf/asound.conf-sample similarity index 100% rename from docs/asound.conf-sample rename to conf/asound.conf-sample diff --git a/configure.ac b/configure.ac index 1d4fb91d..b2cfe01e 100644 --- a/configure.ac +++ b/configure.ac @@ -509,6 +509,7 @@ AC_CONFIG_FILES([rivendell.spec \ docs/apis/Makefile \ docs/examples/Makefile \ docs/manpages/Makefile \ + docs/misc/Makefile \ docs/opsguide/frontspiece.xml \ docs/opsguide/Makefile \ docs/stylesheets/Makefile \ diff --git a/docs/Makefile.am b/docs/Makefile.am index 8af4a05f..8c8685e8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -24,23 +24,9 @@ if DOCBOOK_AM endif SUBDIRS = $(DOCBOOK_AM_OPT) examples\ + misc\ tables -EXTRA_DIST = ALSA.txt\ - ando_interface.odt\ - asound.conf-sample\ - colors\ - copy_split_format.odt\ - NOW+NEXT.txt\ - pam_rd.txt\ - PODCASTING.txt\ - RDMONITOR.txt\ - reports.txt\ - SAGE_ENDEC.txt\ - scheduler_formats.ods\ - WIN32.txt - - CLEANFILES = *~ MAINTAINERCLEANFILES = *~\ aclocal.m4\ diff --git a/docs/NOW+NEXT.txt b/docs/NOW+NEXT.txt deleted file mode 100644 index 627b5aa2..00000000 --- a/docs/NOW+NEXT.txt +++ /dev/null @@ -1,57 +0,0 @@ - CONFIGURING NOW & NEXT IN RIVENDELL - -SCOPE -Rivendell has the ability to automatically send information regarding -the current and next-to-play events in RDAirPlay logs to external -systems (such as RDS/RDBS encoders or web servers) using TCP/IP UDP -datagrams. This capability is referred to in Rivendell as 'Now & -Next'. This document provides some pointers on setting up this -capability. - -CONFIGURATION -Now and Next is configured in RDAdmin->ManageHosts->RDAirPlay. -Pressing the 'Configure Now & Next Parameters' button here will open a -dialog. Each RDAirPlay log machine can be seperately configured, as -follows: - - IP ADDRESS: The IP address, in dotted-quad notation, to which - packets should be sent. - - UDP PORT: The UDP port number to which packets should be sent. - - UDP STRING: The contents of the update string. The following - placeholder macros can be used, which will be replaced - appropriately when a packet is sent: - - %n - The currently-playing CART NUMBER - %g - The currently-playing GROUP NAME - %t - The currently-playing TITLE field - %a - The currently-playing ARTIST field - %l - The currently-playing ALBUM field - %y - The currently-playing YEAR field - %b - The currently-playing LABEL field - %c - The currently-playing CLIENT field - %e - The currently-playing AGENCY field - %u - The currently-playing USER DEFINED field - %h - The length of the currently playing cut, in mS. - %r - A "Unix" style newline (naked ASCII 10) - %R - An "MS-DOS" style newsline (ASCII 13/10) - %% - A literal '%'. - - Additionally, with the exception of the '%r', '%R' and '%%' - placeholders, the corresponding field for the next-to-play - event can be specified by simply uppercasing the above - placeholders. Any other characters will be sent unchanged. - - -ENABLING AUDIO -Before any data is sent, RDAirPlay checks to see that the Group -to which the event's cart belongs has been enabled to send Now & Next -data. This can be set on a group-by-group basis in -RDAdmin->ManageGroups by setting the 'Transmit Now & Next data' box -appropriately. - - -OPERATION -Once properly configured, RDAirPlay will send a UDP packet as -specified every time the corresponding log changes status. diff --git a/docs/WIN32.txt b/docs/WIN32.txt deleted file mode 100644 index 83c5fbf4..00000000 --- a/docs/WIN32.txt +++ /dev/null @@ -1,25 +0,0 @@ - WINDOWS SUPPORT FOR RIVENDELL - -A Windows port of Rivendell exists, consisting of just the RDLogEdit, -RDLogManager and RMLSend tools, primarily intended for use on systems -employing Windows-based traffic and music schedulers. Current binary -versions can be found at: - - ftp://ftp.salemradiolabs.com/pub/srlabs/rivendell/win32/ - -If you wish to build the Windows port from source, please see the -'INSTALL' file. - - -INSTALLING THE BIANRY VERSION -The binary version comes with a standard setup program that will do -most of the work of getting Rivendell installed. After the -installation is complete, you will need to edit the 'rd.ini' file, -located in the Rivendell installation directory (by default, -'C:\ProgramFiles\SalemRadioLabs\Rivendell\') and supply the hostname -and login password to the 'rduser' account on the site's mySQL server. -This file can contain all of the directives and arguments used in -Rivendell's standard '/etc/rd.conf' file (although only a few will -have any real effect in the Windows envrionment). The default -file provided should help get you started. - diff --git a/docs/copy_split_format.odt b/docs/copy_split_format.odt deleted file mode 100644 index 4228db07..00000000 Binary files a/docs/copy_split_format.odt and /dev/null differ diff --git a/docs/ALSA.txt b/docs/misc/ALSA.txt similarity index 100% rename from docs/ALSA.txt rename to docs/misc/ALSA.txt diff --git a/docs/misc/Makefile.am b/docs/misc/Makefile.am new file mode 100644 index 00000000..35f8d588 --- /dev/null +++ b/docs/misc/Makefile.am @@ -0,0 +1,36 @@ +## Makefile.am +## +## docs/misc/Makefile.am for Rivendell +## +## (C) Copyright 2017 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 +## published by the Free Software Foundation. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## +## Use automake to process this into a Makefile.in + +EXTRA_DIST = ALSA.txt\ + ando_interface.odt\ + colors\ + pam_rd.txt\ + PODCASTING.txt\ + RDMONITOR.txt\ + reports.txt\ + SAGE_ENDEC.txt\ + scheduler_formats.ods + +CLEANFILES = *~ +MAINTAINERCLEANFILES = *~\ + aclocal.m4\ + configure\ + Makefile.in diff --git a/docs/PODCASTING.txt b/docs/misc/PODCASTING.txt similarity index 100% rename from docs/PODCASTING.txt rename to docs/misc/PODCASTING.txt diff --git a/docs/RDMONITOR.txt b/docs/misc/RDMONITOR.txt similarity index 100% rename from docs/RDMONITOR.txt rename to docs/misc/RDMONITOR.txt diff --git a/docs/SAGE_ENDEC.txt b/docs/misc/SAGE_ENDEC.txt similarity index 100% rename from docs/SAGE_ENDEC.txt rename to docs/misc/SAGE_ENDEC.txt diff --git a/docs/ando_interface.odt b/docs/misc/ando_interface.odt similarity index 100% rename from docs/ando_interface.odt rename to docs/misc/ando_interface.odt diff --git a/docs/colors b/docs/misc/colors similarity index 100% rename from docs/colors rename to docs/misc/colors diff --git a/docs/pam_rd.txt b/docs/misc/pam_rd.txt similarity index 100% rename from docs/pam_rd.txt rename to docs/misc/pam_rd.txt diff --git a/docs/reports.txt b/docs/misc/reports.txt similarity index 100% rename from docs/reports.txt rename to docs/misc/reports.txt diff --git a/docs/scheduler_formats.ods b/docs/misc/scheduler_formats.ods similarity index 100% rename from docs/scheduler_formats.ods rename to docs/misc/scheduler_formats.ods diff --git a/rivendell.spec.in b/rivendell.spec.in index f8bdbb17..7e0dbafe 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -379,8 +379,6 @@ rm -rf $RPM_BUILD_ROOT %doc conf/rd.conf-sample %doc conf/my.cnf-master %doc conf/my.cnf-standby -%doc docs/colors -%doc docs/pam_rd.txt %doc docs/tables/audio_perms.txt %doc docs/tables/audio_ports.txt %doc docs/tables/cart.txt @@ -405,7 +403,7 @@ rm -rf $RPM_BUILD_ROOT %doc docs/tables/ttys.txt %doc docs/tables/users.txt %doc docs/tables/version.txt -%doc docs/asound.conf-sample +%doc conf/asound.conf-sample %doc conf/rlm_walltime.conf %doc conf/rlm_serial.conf %doc conf/rlm_udp.conf @@ -425,14 +423,13 @@ rm -rf $RPM_BUILD_ROOT %doc conf/rlm_spinitron_plus.conf %doc conf/rlm_tagstation.conf %doc utils/sas_shim/rc.sas_shim -%doc docs/reports.txt -%doc docs/NOW+NEXT.txt -%doc docs/WIN32.txt -%doc docs/ALSA.txt -%doc docs/RDMONITOR.txt -%doc docs/scheduler_formats.ods -%doc docs/copy_split_format.odt -%doc docs/ando_interface.odt +%doc docs/misc/colors +%doc docs/misc/pam_rd.txt +%doc docs/misc/reports.txt +%doc docs/misc/ALSA.txt +%doc docs/misc/RDMONITOR.txt +%doc docs/misc/scheduler_formats.ods +%doc docs/misc/ando_interface.odt %doc scripts/rd_backup %doc scripts/start_traverso.sh %doc scripts/rd_mysql_enable_host.sh