From a2dfda0bd292c94520101a0084ecb72f057b0076 Mon Sep 17 00:00:00 2001 From: David Klann Date: Sat, 27 Oct 2018 22:19:11 -0500 Subject: [PATCH 01/11] Add section "Log Machines" to Chapter 11, describing the "mach" argument to macros that deal with log machines. --- docs/opsguide/rml.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/opsguide/rml.xml b/docs/opsguide/rml.xml index ab8febd9..a6b9e270 100644 --- a/docs/opsguide/rml.xml +++ b/docs/opsguide/rml.xml @@ -169,6 +169,35 @@ + + Log Machines + + Some commands (e.g., MD, PL, + and PS) require a log + machine argument. See + Log Machines in + RDAirPlay for a detailed + description of Log Machines. + + + The log machine argument in the context + of Rivendell macros must be an integer ranging from Zero (0) to + Three (3). 0 represents + all log machines, + 1 represents the Main + Log, 2 represents + Aux Log 1, and + 3 represents Aux Log + 2. + + + For example, the macro PL 1 0! starts + playing at the first line (0) of the + Main Log (log machine + 1). + + + Commands From 7e26b04e40cc6f38dcd82ac5a1b69a12294ef782 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 1 Nov 2018 13:40:15 -0400 Subject: [PATCH 02/11] 2018-11-01 Fred Gleason * Modified rdselect_helper(8) to include the value of the value of the 'MountOptions=' parameter in rd.conf(5) when configuring audio store mounts. --- ChangeLog | 4 ++++ utils/rdselect_helper/rdselect_helper.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d7a1077..5c033fb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17955,3 +17955,7 @@ 2018-11-01 Fred Gleason * Modified rdselect_helper(8) to use the automounter for managing audio store mounts. +2018-11-01 Fred Gleason + * Modified rdselect_helper(8) to include the value of the value of + the 'MountOptions=' parameter in rd.conf(5) when configuring + audio store mounts. diff --git a/utils/rdselect_helper/rdselect_helper.cpp b/utils/rdselect_helper/rdselect_helper.cpp index d2c9ff44..110d116e 100644 --- a/utils/rdselect_helper/rdselect_helper.cpp +++ b/utils/rdselect_helper/rdselect_helper.cpp @@ -115,9 +115,13 @@ void MainObject::Startup() exit(RDConfig::RDSelectCantAccessAutomount); } fprintf(f,"%s",RDSELECT_AUTOMOUNT_WARNING); - fprintf(f,"%s\t-fstype=%s\t%s\n", + QString options="-fstype="+helper_config->audioStoreMountType(); + if(!helper_config->audioStoreMountOptions().isEmpty()) { + options+=","+helper_config->audioStoreMountOptions(); + } + fprintf(f,"%s\t%s\t%s\n", (const char *)helper_config->audioRoot().toUtf8(), - (const char *)helper_config->audioStoreMountType().toUtf8(), + (const char *)options.toUtf8(), (const char *)helper_config->audioStoreMountSource().toUtf8()); fclose(f); From b97af70786d6eafb4f6d981af8407c22d85d9323 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 1 Nov 2018 13:41:04 -0400 Subject: [PATCH 03/11] Fixed a type in 'ChangeLog' --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c033fb3..682fe8b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17956,6 +17956,6 @@ * Modified rdselect_helper(8) to use the automounter for managing audio store mounts. 2018-11-01 Fred Gleason - * Modified rdselect_helper(8) to include the value of the value of + * Modified rdselect_helper(8) to include the value of the 'MountOptions=' parameter in rd.conf(5) when configuring audio store mounts. From 149531ea6916eae486b898579cfe6cfcb7b77b16 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Thu, 1 Nov 2018 15:04:34 -0700 Subject: [PATCH 04/11] Fixed regression with pie widget in rdairplay(1) --- rdairplay/colors.h | 1 + rdairplay/pie_counter.cpp | 13 ++++++------- rdairplay/pie_counter.h | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rdairplay/colors.h b/rdairplay/colors.h index 36165036..536b2493 100644 --- a/rdairplay/colors.h +++ b/rdairplay/colors.h @@ -69,6 +69,7 @@ #define PIE_FINAL_COLOR Qt::black #define PIE_FINAL_BG_COLOR Qt::white #define PIE_ONAIR_COLOR Qt::red +#define PIE_ONAIR_OFF_COLOR Qt::gray // // Widget Colors diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index 1d576f38..a4be689f 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -61,7 +61,6 @@ PieCounter::PieCounter(int count_length,QWidget *parent) pie_talk_label->setFont(font); pie_talk_label->setAlignment(Qt::AlignCenter); pie_talk_label->hide(); - onair_off_color=backgroundColor(); pie_logline=NULL; resetTime(); @@ -188,12 +187,12 @@ void PieCounter::setOnairFlag(bool state) pie_talk_label->setBackgroundColor(PIE_ONAIR_COLOR); } else { - setBackgroundColor(onair_off_color); + setBackgroundColor(PIE_ONAIR_OFF_COLOR); if(!pie_pixmap.isNull()) { QWidget::setErasePixmap(pie_pixmap); } - pie_time_label->setBackgroundColor(onair_off_color); - pie_talk_label->setBackgroundColor(onair_off_color); + pie_time_label->setBackgroundColor(PIE_ONAIR_OFF_COLOR); + pie_talk_label->setBackgroundColor(PIE_ONAIR_OFF_COLOR); } pie_onair=state; } @@ -255,7 +254,7 @@ void PieCounter::paintEvent(QPaintEvent *e) ring_angle = 0; if(pie_onair||pie_pixmap.isNull()) { - p->fillRect(0,0,PIE_COUNTER_BBOX,PIE_COUNTER_BBOX,backgroundColor()); + p->fillRect(0,0,PIE_COUNTER_BBOX,PIE_COUNTER_BBOX,PIE_ONAIR_OFF_COLOR); } else { p->drawPixmap(-PIE_X_PADDING,-PIE_Y_PADDING,pie_pixmap); @@ -299,8 +298,8 @@ void PieCounter::paintEvent(QPaintEvent *e) if(((pie_time0))|| ((((750+pie_talk_end-pie_pos)/1000)<100)&& ((pie_pos>=pie_talk_start)&&(pie_pos<=pie_talk_end)))) { - p->setBrush(backgroundColor()); - p->setPen(backgroundColor()); + p->setBrush(PIE_ONAIR_OFF_COLOR); + p->setPen(PIE_ONAIR_OFF_COLOR); p->drawPie(ring+20,ring+20,PIE_COUNTER_SIZE-40,PIE_COUNTER_SIZE-40,0,5760); } } diff --git a/rdairplay/pie_counter.h b/rdairplay/pie_counter.h index 6c00aa05..f9a68520 100644 --- a/rdairplay/pie_counter.h +++ b/rdairplay/pie_counter.h @@ -90,7 +90,6 @@ class PieCounter : public QWidget RDAirPlayConf::OpMode pie_op_mode; RDLogLine::TransType pie_trans_type; int air_line; - QColor onair_off_color; RDLogLine *pie_logline; QPixmap pie_pixmap; bool pie_onair; From a5e9040a049159afa5d90280c4b12e8b2cedcdb2 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Thu, 1 Nov 2018 15:05:41 -0700 Subject: [PATCH 05/11] Fixed regression with pie widget in rdairplay(1) --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6d7a1077..cbd61dd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17955,3 +17955,5 @@ 2018-11-01 Fred Gleason * Modified rdselect_helper(8) to use the automounter for managing audio store mounts. +2018-11-01 Patrick Linstruth + * Fixed regression with pie widget in rdairplay(1). From b13374069cb270447559fe2cae99bd603afcae9e Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 2 Nov 2018 10:29:17 -0400 Subject: [PATCH 06/11] Updated 'ChangeLog' --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index af945fb1..3aac08e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17961,3 +17961,6 @@ audio store mounts. 2018-11-02 Patrick Linstruth * Fixed regression with pie widget in rdairplay(1). +2018-11-02 David Klann + * Added a 'Log Machines' section to the 'Rivendell Macro Language' + chapter of the Operations Guide. From 03551cfb2bde4b17ec706ebfda244a8f633fa682 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Fri, 2 Nov 2018 07:35:35 -0700 Subject: [PATCH 07/11] Fix off air color --- rdairplay/pie_counter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index a4be689f..cafdd05e 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -254,7 +254,7 @@ void PieCounter::paintEvent(QPaintEvent *e) ring_angle = 0; if(pie_onair||pie_pixmap.isNull()) { - p->fillRect(0,0,PIE_COUNTER_BBOX,PIE_COUNTER_BBOX,PIE_ONAIR_OFF_COLOR); + p->fillRect(0,0,PIE_COUNTER_BBOX,PIE_COUNTER_BBOX,PIE_ONAIR_COLOR); } else { p->drawPixmap(-PIE_X_PADDING,-PIE_Y_PADDING,pie_pixmap); From e22e95c1b829d77abd7ac3cb8dfb4d71e223a359 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Fri, 2 Nov 2018 07:36:00 -0700 Subject: [PATCH 08/11] Add On-Air flag information to Pie Widget --- docs/opsguide/rdairplay.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/opsguide/rdairplay.xml b/docs/opsguide/rdairplay.xml index c4d98140..7a97427b 100644 --- a/docs/opsguide/rdairplay.xml +++ b/docs/opsguide/rdairplay.xml @@ -161,13 +161,15 @@ widget counts down the final few seconds of each event. The length of time it counts down, along with whether it counts to the start of the next transition or the absolute end of the event are both - configurable in RDADmin. The color of the band that grows as the + configurable in RDAdmin. The color of the band that grows as the countdown progresses (shown in GREEN in the illustration) will change color to indicate if the currently playing event is the last event before a log stopdown. If it is the last, it will be RED, if not, GREEN. A BLUE band and countdown will also appear to indicate the event's talk time (if talk time markers have been set in the underlying cart). + If the On-Air flag has been set to ON, the area around the + pie widget will be RED. From a887e1d9557ffce46bfd9cef9d7d384b82a4b2e6 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Fri, 2 Nov 2018 07:48:48 -0700 Subject: [PATCH 09/11] Fixed bugs in processing of RMLs with boolean parameters --- lib/rdripc.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/rdripc.cpp b/lib/rdripc.cpp index 0b2fa87f..d3c4bb6d 100644 --- a/lib/rdripc.cpp +++ b/lib/rdripc.cpp @@ -146,7 +146,7 @@ void RDRipc::sendNotification(const RDNotification ¬ify) void RDRipc::sendOnairFlag() { - SendCommand("TA!"); + SendCommand(QString().sprintf("TA %d!",ripc_onair_flag)); } @@ -269,7 +269,7 @@ void RDRipc::DispatchCommand() if(!macro.isNull()) { QHostAddress addr; addr.setAddress(cmds[1]); - if(cmds[2].left(0)=="1") { + if(cmds[2].left(1)=="1") { macro.setEchoRequested(true); } macro.setAddress(addr); @@ -304,7 +304,7 @@ void RDRipc::DispatchCommand() int line=cmds[2].toInt(); int mask=cmds[4].toInt(); if((mask>0)||ripc_ignore_mask) { - if(cmds[3].left(0)=="0") { + if(cmds[3].left(1)=="0") { emit gpiStateChanged(matrix,line,false); } else { @@ -321,7 +321,7 @@ void RDRipc::DispatchCommand() int line=cmds[2].toInt(); int mask=cmds[4].toInt(); if((mask>0)||ripc_ignore_mask) { - if(cmds[3].left(0)=="0") { + if(cmds[3].left(1)=="0") { emit gpoStateChanged(matrix,line,false); } else { @@ -336,7 +336,7 @@ void RDRipc::DispatchCommand() } int matrix=cmds[1].toInt(); int line=cmds[2].toInt(); - if(cmds[3].left(0)=="0") { + if(cmds[3].left(1)=="0") { emit gpiMaskChanged(matrix,line,false); } else { @@ -350,7 +350,7 @@ void RDRipc::DispatchCommand() } int matrix=cmds[1].toInt(); int line=cmds[2].toInt(); - if(cmds[3].left(0)=="0") { + if(cmds[3].left(1)=="0") { emit gpoMaskChanged(matrix,line,false); } else { @@ -384,7 +384,7 @@ void RDRipc::DispatchCommand() if(cmds.size()!=2) { return; } - ripc_onair_flag=cmds[1].left(0)=="1"; + ripc_onair_flag=cmds[1].left(1)=="1"; emit onairFlagChanged(ripc_onair_flag); } From 40831704910de7bdc8d38754fad56f78c9cb83e9 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Fri, 2 Nov 2018 07:50:59 -0700 Subject: [PATCH 10/11] Updated ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6d7a1077..461b412b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17955,3 +17955,5 @@ 2018-11-01 Fred Gleason * Modified rdselect_helper(8) to use the automounter for managing audio store mounts. +2018-11-02 Patrick Linstruth + * Fixed bug in in some RML commands with boolean paramters. From 055029b16fce84ce626027a704c4a752f2d903c5 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 2 Nov 2018 11:09:05 -0400 Subject: [PATCH 11/11] Updated 'ChangeLog' --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3aac08e5..6991cfa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17964,3 +17964,7 @@ 2018-11-02 David Klann * Added a 'Log Machines' section to the 'Rivendell Macro Language' chapter of the Operations Guide. +2018-11-02 Patrick Linstruth + * Fixed the 'off air' color in the Pie Widget in rdairplay(1). + * Added information regarding the OnAir Flag to the Operations + Guide.