diff --git a/ChangeLog b/ChangeLog index 80ca4a94..ff64a01d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17955,5 +17955,18 @@ 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 'MountOptions=' parameter in rd.conf(5) when configuring + audio store mounts. 2018-11-02 Patrick Linstruth - * Fix bugs in processing of some RML with boolean parameters. + * 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. +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. +2018-11-02 Patrick Linstruth + * Fixed bug in in some RML commands with boolean paramters. 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. 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 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..cafdd05e 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_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; 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);