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

2024-08-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that could cause events with Segue
	transitions to clip off the end of the previous event if the previous
	event did not have a segue marker set.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2024-08-25 21:18:00 -04:00
parent d36717d885
commit 254b9bdcdd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24861,3 +24861,7 @@
entering a URL scheme of 'https'.
2024-08-25 Fred Gleason <fredg@paravelsystems.com>
* Added a 'File Metadata' appendix to the Operations Guide.
2024-08-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that could cause events with Segue
transitions to clip off the end of the previous event if the previous
event did not have a segue marker set.

20
lib/rdlogplay.cpp
View File

@ -1954,6 +1954,14 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
//
running=runningEvents(lines);
if(play_op_mode!=RDAirPlayConf::Manual) {
//
// Remove degenerate segue transitions
//
if((trans_type==RDLogLine::Segue)&&(trans_length<=0)) {
trans_type=RDLogLine::Play;
}
switch(trans_type) {
case RDLogLine::Play:
for(int i=0;i<running;i++) {
@ -2440,16 +2448,8 @@ void RDLogPlay::FinishEvent(int line)
}
if((play_op_mode==RDAirPlayConf::Auto)&&
(logline->id()!=-1)&&(play_next_line<lineCount())) {
if(play_next_line>=0) {
if(logline->transType()==RDLogLine::Play) {
StartEvent(play_next_line,RDLogLine::Play,0,RDLogLine::StartPlay);
SetTransTimer(QTime(),prev_next_line==play_trans_line);
}
if(logline->transType()==RDLogLine::Segue) {
StartEvent(play_next_line,RDLogLine::Segue,0,RDLogLine::StartPlay);
SetTransTimer(QTime(),prev_next_line==play_trans_line);
}
}
StartEvent(play_next_line,RDLogLine::Play,0,RDLogLine::StartPlay);
SetTransTimer(QTime(),prev_next_line==play_trans_line);
}
}
}