Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

2020-02-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdairplay(1) that could cause random segfaults
	when updating the Label Widget.
This commit is contained in:
Fred Gleason
2020-02-18 11:58:46 -05:00
parent 6fe981d930
commit f54d414f6f
10 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rdairplay/rdairplay.cpp
View File

@@ -2,7 +2,7 @@
//
// 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
// 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()));
rename_mapper->setMapping(air_log[i],i);
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)),
this,SLOT(logChannelStartedData(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
//
air_message_label=new RDLabel(this);
air_message_label=new QLabel(this);
air_message_label->setGeometry(sizeHint().width()-425,70,
MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height());
air_message_label->setStyleSheet("background-color: "+
QColor(LOGLINEBOX_BACKGROUND_COLOR).name());
air_message_label->setWordWrapEnabled(true);
air_message_label->setWordWrap(true);
air_message_label->setLineWidth(1);
air_message_label->setMidLineWidth(1);
air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
@@ -496,17 +494,6 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
air_copy_button->setFocusPolicy(Qt::NoFocus);
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
//
@@ -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()
{
air_splash_screen->hide();