mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-07-19 14:17:42 +02:00
2020-02-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdairplay(1) that could cause random segfaults when updating the Label Widget.
This commit is contained in:
parent
6fe981d930
commit
f54d414f6f
@ -19646,3 +19646,6 @@
|
|||||||
['SI'] RML that could cause deadlocks and intermittent operation.
|
['SI'] RML that could cause deadlocks and intermittent operation.
|
||||||
2020-02-18 Fred Gleason <fredg@paravelsystems.com>
|
2020-02-18 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Incremented the package version to 3.2.1int2.
|
* Incremented the package version to 3.2.1int2.
|
||||||
|
2020-02-18 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed a bug in rdairplay(1) that could cause random segfaults
|
||||||
|
when updating the Label Widget.
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
//
|
//
|
||||||
// The On Air Playout Utility for Rivendell.
|
// The On Air Playout Utility for Rivendell.
|
||||||
//
|
//
|
||||||
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
|
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
|
||||||
//
|
//
|
||||||
// This program is free software; you can redistribute it and/or modify
|
// 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
|
// it under the terms of the GNU General Public License version 2 as
|
||||||
@ -290,8 +290,6 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
|
|||||||
connect(air_log[i],SIGNAL(reloaded()),reload_mapper,SLOT(map()));
|
connect(air_log[i],SIGNAL(reloaded()),reload_mapper,SLOT(map()));
|
||||||
rename_mapper->setMapping(air_log[i],i);
|
rename_mapper->setMapping(air_log[i],i);
|
||||||
connect(air_log[i],SIGNAL(renamed()),rename_mapper,SLOT(map()));
|
connect(air_log[i],SIGNAL(renamed()),rename_mapper,SLOT(map()));
|
||||||
connect(air_log[i],SIGNAL(refreshStatusChanged(bool)),
|
|
||||||
this,SLOT(refreshStatusChangedData(bool)));
|
|
||||||
connect(air_log[i],SIGNAL(channelStarted(int,int,int,int)),
|
connect(air_log[i],SIGNAL(channelStarted(int,int,int,int)),
|
||||||
this,SLOT(logChannelStartedData(int,int,int,int)));
|
this,SLOT(logChannelStartedData(int,int,int,int)));
|
||||||
connect(air_log[i],SIGNAL(channelStopped(int,int,int,int)),
|
connect(air_log[i],SIGNAL(channelStopped(int,int,int,int)),
|
||||||
@ -395,12 +393,12 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
|
|||||||
//
|
//
|
||||||
// Message Label
|
// Message Label
|
||||||
//
|
//
|
||||||
air_message_label=new RDLabel(this);
|
air_message_label=new QLabel(this);
|
||||||
air_message_label->setGeometry(sizeHint().width()-425,70,
|
air_message_label->setGeometry(sizeHint().width()-425,70,
|
||||||
MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height());
|
MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height());
|
||||||
air_message_label->setStyleSheet("background-color: "+
|
air_message_label->setStyleSheet("background-color: "+
|
||||||
QColor(LOGLINEBOX_BACKGROUND_COLOR).name());
|
QColor(LOGLINEBOX_BACKGROUND_COLOR).name());
|
||||||
air_message_label->setWordWrapEnabled(true);
|
air_message_label->setWordWrap(true);
|
||||||
air_message_label->setLineWidth(1);
|
air_message_label->setLineWidth(1);
|
||||||
air_message_label->setMidLineWidth(1);
|
air_message_label->setMidLineWidth(1);
|
||||||
air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
|
air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
|
||||||
@ -496,17 +494,6 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
|
|||||||
air_copy_button->setFocusPolicy(Qt::NoFocus);
|
air_copy_button->setFocusPolicy(Qt::NoFocus);
|
||||||
connect(air_copy_button,SIGNAL(clicked()),this,SLOT(copyButtonData()));
|
connect(air_copy_button,SIGNAL(clicked()),this,SLOT(copyButtonData()));
|
||||||
|
|
||||||
//
|
|
||||||
// Refresh Indicator
|
|
||||||
//
|
|
||||||
air_refresh_label=new RDLabel(this);
|
|
||||||
air_refresh_label->setGeometry(390,sizeHint().height()-65,120,60);
|
|
||||||
air_refresh_label->setFont(bigButtonFont());
|
|
||||||
QPalette p=palette();
|
|
||||||
p.setColor(QColorGroup::Foreground,Qt::red);
|
|
||||||
air_refresh_label->setPalette(p);
|
|
||||||
air_refresh_label->setAlignment(Qt::AlignCenter);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Meter Timer
|
// Meter Timer
|
||||||
//
|
//
|
||||||
@ -1803,17 +1790,6 @@ void MainWidget::timeModeData(RDAirPlayConf::TimeMode mode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MainWidget::refreshStatusChangedData(bool active)
|
|
||||||
{
|
|
||||||
if(active) {
|
|
||||||
air_refresh_label->setText(tr("LOG\nREFRESHING"));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
air_refresh_label->setText("");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void MainWidget::clearSplashData()
|
void MainWidget::clearSplashData()
|
||||||
{
|
{
|
||||||
air_splash_screen->hide();
|
air_splash_screen->hide();
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
//
|
//
|
||||||
// The On Air Playout Utility for Rivendell.
|
// The On Air Playout Utility for Rivendell.
|
||||||
//
|
//
|
||||||
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
|
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
|
||||||
//
|
//
|
||||||
// This program is free software; you can redistribute it and/or modify
|
// 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
|
// it under the terms of the GNU General Public License version 2 as
|
||||||
@ -96,7 +96,6 @@ class MainWidget : public RDWidget
|
|||||||
void masterTimerData();
|
void masterTimerData();
|
||||||
void transportChangedData();
|
void transportChangedData();
|
||||||
void timeModeData(RDAirPlayConf::TimeMode mode);
|
void timeModeData(RDAirPlayConf::TimeMode mode);
|
||||||
void refreshStatusChangedData(bool active);
|
|
||||||
void clearSplashData();
|
void clearSplashData();
|
||||||
void keyPressEvent(QKeyEvent *e);
|
void keyPressEvent(QKeyEvent *e);
|
||||||
void keyReleaseEvent(QKeyEvent *e);
|
void keyReleaseEvent(QKeyEvent *e);
|
||||||
@ -153,7 +152,7 @@ class MainWidget : public RDWidget
|
|||||||
QString air_add_filter;
|
QString air_add_filter;
|
||||||
QString air_add_group;
|
QString air_add_group;
|
||||||
QString air_add_schedcode;
|
QString air_add_schedcode;
|
||||||
RDLabel *air_message_label;
|
QLabel *air_message_label;
|
||||||
int air_source_id;
|
int air_source_id;
|
||||||
int air_meter_card[3];
|
int air_meter_card[3];
|
||||||
int air_meter_port[3];
|
int air_meter_port[3];
|
||||||
@ -169,7 +168,6 @@ class MainWidget : public RDWidget
|
|||||||
bool air_start_start[RDAIRPLAY_LOG_QUANTITY];
|
bool air_start_start[RDAIRPLAY_LOG_QUANTITY];
|
||||||
RDAirPlayConf::ExitCode rdairplay_previous_exit_code;
|
RDAirPlayConf::ExitCode rdairplay_previous_exit_code;
|
||||||
QDateTime air_startup_datetime;
|
QDateTime air_startup_datetime;
|
||||||
RDLabel *air_refresh_label;
|
|
||||||
QPixmap *air_refresh_pixmap;
|
QPixmap *air_refresh_pixmap;
|
||||||
QString air_editor_cmd;
|
QString air_editor_cmd;
|
||||||
QSplashScreen *air_splash_screen;
|
QSplashScreen *air_splash_screen;
|
||||||
|
@ -675,7 +675,7 @@ panel</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>ZÁPIS
|
<translation type="obsolete">ZÁPIS
|
||||||
OBNOVEN</translation>
|
OBNOVEN</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -675,7 +675,7 @@ Panel</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>LOG
|
<translation type="obsolete">LOG
|
||||||
AKTUALISIERT</translation>
|
AKTUALISIERT</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -679,7 +679,7 @@ sonidos</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>LEYENDO
|
<translation type="obsolete">LEYENDO
|
||||||
LISTA</translation>
|
LISTA</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -679,7 +679,7 @@ de sons</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>MISE A JOUR
|
<translation type="obsolete">MISE A JOUR
|
||||||
DU LOG</translation>
|
DU LOG</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -685,7 +685,7 @@ panel</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>LOGGEN
|
<translation type="obsolete">LOGGEN
|
||||||
LASTAR PÅ NYTT</translation>
|
LASTAR PÅ NYTT</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -685,7 +685,7 @@ panel</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>LOGGEN
|
<translation type="obsolete">LOGGEN
|
||||||
LASTAR PÅ NYTT</translation>
|
LASTAR PÅ NYTT</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -681,7 +681,7 @@ de Sons</translation>
|
|||||||
<message>
|
<message>
|
||||||
<source>LOG
|
<source>LOG
|
||||||
REFRESHING</source>
|
REFRESHING</source>
|
||||||
<translation>ATUALIZANDO
|
<translation type="obsolete">ATUALIZANDO
|
||||||
LISTA</translation>
|
LISTA</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user