Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-31 16:12:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-issue552'

Browse Source
This commit is contained in:
Fred Gleason 2020-04-08 18:26:55 -04:00
commit 0ae0b38840
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19749,6 +19749,7 @@
* Fixed a regression in rdairplay(1) that caused two events to be
started by a single spacebar tap if a SoundPanel event had been
played previously.
<<<<<<< HEAD
2020-04-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused the initial event
in an imported set to fail receive the proper time and transition
@ -19760,3 +19761,6 @@
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in rdlogmanager(1) that caused 'Make Post Point'
label to be displayed without last 't'.
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in rdairplay(1) with HourSelector::updateTimeData()
where timer was not set properly when crossing midnight.

10
rdairplay/hourselector.cpp
View File

@ -46,6 +46,7 @@ HourSelector::HourSelector(QWidget *parent)
// Update Timer
//
hour_update_timer=new QTimer(this);
hour_update_timer->setSingleShot(true);
connect(hour_update_timer,SIGNAL(timeout()),this,SLOT(updateTimeData()));
updateTimeData();
}
@ -124,10 +125,13 @@ void HourSelector::hourClicked(int hour)
void HourSelector::updateTimeData()
{
QTime now=QTime::currentTime();
QDateTime now=QDateTime::currentDateTime();
QDateTime next;
for(unsigned i=0;i<24;i++) {
hour_button[i]->setPalette(palette());
}
hour_button[now.hour()]->setPalette(hour_active_palette);
hour_update_timer->start(now.msecsTo(QTime(now.hour()+1,0,1)),true);
hour_button[now.time().hour()]->setPalette(hour_active_palette);
next=now.addSecs(60*60); // Next hour
next.setTime(QTime(next.time().hour(),0,1)); // Set top of hour HH:00:01
hour_update_timer->start(now.msecsTo(next)); // Start timer
}