Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-20 07:31:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-rdairplay-pie'

Browse Source
This commit is contained in:
Fred Gleason
2018-11-02 11:10:00 -04:00
parent 42d1f75bb5 055029b16f
commit 7f394f4e32
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -17964,3 +17964,7 @@
2018-11-02 David Klann <dklann@linux.com> 2018-11-02 David Klann <dklann@linux.com>
* Added a 'Log Machines' section to the 'Rivendell Macro Language' * Added a 'Log Machines' section to the 'Rivendell Macro Language'
chapter of the Operations Guide. chapter of the Operations Guide.
2018-11-02 Patrick Linstruth <patrick@deltecent.com>
* Fixed the 'off air' color in the Pie Widget in rdairplay(1).
* Added information regarding the OnAir Flag to the Operations
Guide.

4
docs/opsguide/rdairplay.xml
View File

@@ -161,13 +161,15 @@
widget counts down the final few seconds of each event. The length 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 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 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 countdown progresses (shown in GREEN in the illustration) will
change color change color
to indicate if the currently playing event is the last event before 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 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 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). 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.
</para> </para>
</sect2> </sect2>
<sect2 xml:id="sect.rdairplay.the_next_stop_counter"> <sect2 xml:id="sect.rdairplay.the_next_stop_counter">

2
rdairplay/pie_counter.cpp
View File

@@ -254,7 +254,7 @@ void PieCounter::paintEvent(QPaintEvent *e)
ring_angle = 0; ring_angle = 0;
if(pie_onair||pie_pixmap.isNull()) { 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 { else {
p->drawPixmap(-PIE_X_PADDING,-PIE_Y_PADDING,pie_pixmap); p->drawPixmap(-PIE_X_PADDING,-PIE_Y_PADDING,pie_pixmap);