Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-10 09:27:44 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in rdairplay(1) that caused the 'Forced Segue'
	setting in rdadmin(1) to be ignored when executing an event with
	a hard start attribute.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-06-08 09:41:31 -04:00
parent 5dd584960d
commit cb9ee9af5a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19857,3 +19857,7 @@
* Added a 'Results Report' report in rdadmin(1). * Added a 'Results Report' report in rdadmin(1).
2020-06-05 Fred Gleason <fredg@paravelsystems.com> 2020-06-05 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version 3.4.0int0. * Incremented the package version 3.4.0int0.
2020-06-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused the 'Forced Segue'
setting in rdadmin(1) to be ignored when executing an event with
a hard start attribute.

10
lib/rdlogplay.cpp
View File

@ -2,7 +2,7 @@
// //
// Rivendell Log Playout Machine // Rivendell Log Playout Machine
// //
// (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 // 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 // it under the terms of the GNU General Public License version 2 as
@ -1432,7 +1432,13 @@ void RDLogPlay::transTimerData()
} }
makeNext(play_trans_line); makeNext(play_trans_line);
if(logline->transType()!=RDLogLine::Stop || grace>=0) { if(logline->transType()!=RDLogLine::Stop || grace>=0) {
StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime); if(play_trans_length>0) {
StartEvent(trans_line,RDLogLine::Segue,play_trans_length,
RDLogLine::StartTime);
}
else {
StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime);
}
} }
} }
SetTransTimer(); SetTransTimer();