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

2020-06-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a cast overflow bug in rdairplay(1) that cause incorrect
	pie timer indications after adding or deleting events to a running
	log.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-06-09 09:00:48 -04:00
parent aed6e5b6bc
commit bfab34e478
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -19864,3 +19864,7 @@
2020-06-08 Fred Gleason <fredg@paravelsystems.com> 2020-06-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdairplay(1) where a paused event could not be * Fixed a bug in rdairplay(1) where a paused event could not be
removed by dropping the empty cart on it. removed by dropping the empty cart on it.
2020-06-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a cast overflow bug in rdairplay(1) that cause incorrect
pie timer indications after adding or deleting events to a running
log.

12
rdairplay/rdairplay.cpp
View File

@@ -1724,16 +1724,18 @@ void MainWidget::transportChangedData()
case RDAirPlayConf::CartTransition: case RDAirPlayConf::CartTransition:
if((next_logline=air_log[0]-> if((next_logline=air_log[0]->
logLine(air_log[0]->nextLine(line)))!=NULL) { logLine(air_log[0]->nextLine(line)))!=NULL) {
if((unsigned)logline->startTime(RDLogLine::Actual). //
// Are we not past the segue point?
//
if((logline->playPosition()>
(unsigned)logline->segueLength(next_logline->transType()))||
((unsigned)logline->startTime(RDLogLine::Actual).
msecsTo(QTime::currentTime())< msecsTo(QTime::currentTime())<
logline->segueLength(next_logline->transType())- logline->segueLength(next_logline->transType())-
logline->playPosition()) { logline->playPosition())) {
air_pie_counter-> air_pie_counter->
setTime(logline->segueLength(next_logline->transType())); setTime(logline->segueLength(next_logline->transType()));
} }
else {
air_pie_counter->setTime(logline->effectiveLength());
}
} }
else { else {
air_pie_counter->setTime(logline->effectiveLength()); air_pie_counter->setTime(logline->effectiveLength());