Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-08 08:02:41 +02:00
Code Issues Projects Releases Wiki Activity

2016-07-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up warning in 'rdairplay/log_play.cpp'.
This commit is contained in:
Fred Gleason 2016-07-22 18:32:59 -04:00
parent 368c310a5e
commit b257ba924c
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -15403,3 +15403,5 @@
a SQL error when logging ELR data. a SQL error when logging ELR data.
2016-07-22 Fred Gleason <fredg@paravelsystems.com> 2016-07-22 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdairplay/log_play.cpp' that caused a SQL error. * Fixed a bug in 'rdairplay/log_play.cpp' that caused a SQL error.
2016-07-22 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up warning in 'rdairplay/log_play.cpp'.

43
rdairplay/log_play.cpp
View File

@ -2255,27 +2255,30 @@ QTime LogPlay::GetStartTime(QTime sched_time,
break; break;
} }
switch(time_type) { switch(time_type) {
case RDLogLine::Relative: case RDLogLine::Relative:
if(!prev_time.isNull()) { if(!prev_time.isNull()) {
*stop=false; *stop=false;
return time; return time;
} }
*stop=true; *stop=true;
return QTime(); return QTime();
break; break;
case RDLogLine::Hard: case RDLogLine::Hard:
if((time<sched_time)||(time.isNull())) { if((time<sched_time)||(time.isNull())) {
*stop=true; *stop=true;
} }
else { else {
*stop=false; *stop=false;
} }
if(running_events&&(time<sched_time)&&(trans_type!=RDLogLine::Stop)) { if(running_events&&(time<sched_time)&&(trans_type!=RDLogLine::Stop)) {
return time; return time;
} }
return sched_time; return sched_time;
break; break;
case RDLogLine::NoTime:
break;
} }
return QTime(); return QTime();
} }