Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-22 16:59:24 +02:00
Code Issues Projects Releases Wiki Activity

2014-09-04 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'rdairplay/nownext.cpp' that caused PAD updates
	to be sent for macro carts with the asyncronous attribute set.
This commit is contained in:
Fred Gleason 2014-09-04 19:39:42 -04:00
parent 8b0aa4622d
commit a4e288508c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -14420,3 +14420,6 @@
2014-09-04 Fred Gleason <fredg@paravelsystems.com> 2014-09-04 Fred Gleason <fredg@paravelsystems.com>
* Removed object names in 'rdairplay/log_play.cpp' and * Removed object names in 'rdairplay/log_play.cpp' and
'rdairplay/log_play.h'. 'rdairplay/log_play.h'.
2014-09-04 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdairplay/nownext.cpp' that caused PAD updates
to be sent for macro carts with the asyncronous attribute set.

6
rdairplay/nownext.cpp
View File

@ -74,7 +74,7 @@ void LogPlay::SendNowNext()
for(int i=nextLine();i<size();i++) { for(int i=nextLine();i<size();i++) {
if((ll=logLine(i))!=NULL) { if((ll=logLine(i))!=NULL) {
if((ll->status()==RDLogLine::Scheduled)&& if((ll->status()==RDLogLine::Scheduled)&&
logLine(i)->nowNextEnabled()) { logLine(i)->nowNextEnabled()&&(!logLine(i)->asyncronous())) {
logline[1]=logLine(i); logline[1]=logLine(i);
i=size(); i=size();
} }
@ -91,7 +91,9 @@ void LogPlay::SendNowNext()
unsigned nowcart=0; unsigned nowcart=0;
unsigned nextcart=0; unsigned nextcart=0;
if(logline[0]!=NULL) { if(logline[0]!=NULL) {
nowcart=logline[0]->cartNumber(); if(!logline[0]->asyncronous()) {
nowcart=logline[0]->cartNumber();
}
} }
if(logline[1]!=NULL) { if(logline[1]!=NULL) {
nextcart=logline[1]->cartNumber(); nextcart=logline[1]->cartNumber();