Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-29 15:09:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ElvishArtisan/rivendell

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Patrick Linstruth 2018-11-02 09:14:12 -07:00
commit e5afe1eac7
7 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -17955,5 +17955,18 @@
2018-11-01 Fred Gleason <fredg@paravelsystems.com>
* Modified rdselect_helper(8) to use the automounter for managing
audio store mounts.
2018-11-01 Fred Gleason <fredg@paravelsystems.com>
* 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 <patrick@deltecent.com>
* Fix bugs in processing of some RML with boolean parameters.
* Fixed regression with pie widget in rdairplay(1).
2018-11-02 David Klann <dklann@linux.com>
* Added a 'Log Machines' section to the 'Rivendell Macro Language'
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.
2018-11-02 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in in some RML commands with boolean paramters.

4
docs/opsguide/rdairplay.xml
View File

@ -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.
</para>
</sect2>
<sect2 xml:id="sect.rdairplay.the_next_stop_counter">

29
docs/opsguide/rml.xml
View File

@ -169,6 +169,35 @@
</para>
</sect1>
<sect1 xml:id="sect.rml.log_machines">
<title>Log Machines</title>
<para>
Some commands (e.g., <command>MD</command>, <command>PL</command>,
and <command>PS</command>) require a <replaceable>log
machine</replaceable> argument. See
<xref linkend="sect.rdairplay.log_machines">Log Machines</xref> in
<xref linkend="chapter.rdairplay">RDAirPlay</xref> for a detailed
description of Log Machines.
</para>
<para>
The <replaceable>log machine</replaceable> argument in the context
of Rivendell macros must be an integer ranging from Zero (0) to
Three (3). <replaceable>0</replaceable> represents
<emphasis>all</emphasis> log machines,
<replaceable>1</replaceable> represents the <computeroutput>Main
Log</computeroutput>, <replaceable>2</replaceable> represents
<computeroutput>Aux Log 1</computeroutput>, and
<replaceable>3</replaceable> represents <computeroutput>Aux Log
2</computeroutput>.
</para>
<para>
For example, the macro <userinput>PL 1 0!</userinput> starts
playing at the first line (<replaceable>0</replaceable>) of the
<replaceable>Main Log</replaceable> (log machine
<replaceable>1</replaceable>).
</para>
</sect1>
<sect1 xml:id="sect.rml.commands">
<title>Commands</title>
<sect2 xml:id="sect.rml.air_gate__ag_">

1
rdairplay/colors.h
View File

@ -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

13
rdairplay/pie_counter.cpp
View File

@ -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_time<pie_count_length)&&(pie_time>0))||
((((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);
}
}

1
rdairplay/pie_counter.h
View File

@ -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;

8
utils/rdselect_helper/rdselect_helper.cpp
View File

@ -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);