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

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

Browse Source 
* Fixed a bug in rdlogmanager(1) that caused the initial event
	in an imported set to fail receive the proper time and transition
	type if the 'Include Import Markers in Finished Logs' checkbox in
	rdadmin(1) had not been ticked.
This commit is contained in:
Fred Gleason 2020-04-08 16:49:25 -04:00
parent d0c232eef1
commit b06791ae27
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19749,3 +19749,8 @@
* Fixed a regression in rdairplay(1) that caused two events to be
started by a single spacebar tap if a SoundPanel event had been
played previously.
2020-04-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused the initial event
in an imported set to fail receive the proper time and transition
type if the 'Include Import Markers in Finished Logs' checkbox in
rdadmin(1) had not been ticked.

32
lib/rdevent_line.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Log Manager Event
//
// (C) Copyright 2002-2018 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
// it under the terms of the GNU General Public License version 2 as
@ -996,15 +996,22 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
*(e->logLine(e->size()-1))=*logline;
delete logline;
logline=NULL;
}
//
// Clear Leading Event Values
//
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
// time=time.addMSecs(length);
grace_time=-1;
//
// Clear Leading Event Values
//
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
grace_time=-1;
}
else {
//
// Propagate Leading Event Values to Next Event
//
time_type=link_logline->timeType();
trans_type=link_logline->transType();
grace_time=link_logline->graceTime();
}
//
// Calculate Event Time Boundaries
@ -1190,6 +1197,13 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
}
}
time=time.addMSecs(length);
//
// Clear Leading Event Values
//
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
grace_time=-1;
}
delete q;