Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-15 00:56:03 +01:00
Code Issues Projects Releases Wiki Activity

2017-07-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'lib/rdevent_line.cpp' that caused embedded traffic
	import events to be assigned incorrect link parameters when scheduled
	immediately after a voice track.
This commit is contained in:
Fred Gleason
2017-07-28 07:20:07 -04:00
parent 9a8cea6f66
commit e344975433
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -15903,3 +15903,7 @@
<startPoint> and <endPoint> values to the returned. <startPoint> and <endPoint> values to the returned.
2017-07-18 Fred Gleason <fredg@paravelsystems.com> 2017-07-18 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.16.0int06_rfa01. * Incremented the package version to 2.16.0int06_rfa01.
2017-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'lib/rdevent_line.cpp' that caused embedded traffic
import events to be assigned incorrect link parameters when scheduled
immediately after a voice track.

10
lib/rdevent_line.cpp
View File

@@ -1040,8 +1040,14 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
logline->setTransType(trans_type); logline->setTransType(trans_type);
logline->setEventLength(event_length); logline->setEventLength(event_length);
logline->setLinkEventName(event_nested_event); logline->setLinkEventName(event_nested_event);
logline->setLinkStartTime(link_logline->linkStartTime()); if((!q->value(12).isNull())&&(!q->value(13).isNull())) {
logline->setLinkLength(link_logline->linkLength()); logline->setLinkStartTime(q->value(12).toTime());
logline->setLinkLength(q->value(13).toInt());
}
else {
logline->setLinkStartTime(link_logline->linkStartTime());
logline->setLinkLength(link_logline->linkLength());
}
logline->setLinkStartSlop(link_logline->linkStartSlop()); logline->setLinkStartSlop(link_logline->linkStartSlop());
logline->setLinkEndSlop(link_logline->linkEndSlop()); logline->setLinkEndSlop(link_logline->linkEndSlop());
logline->setLinkId(link_logline->linkId()); logline->setLinkId(link_logline->linkId());

2
lib/rdsvc.cpp
View File

@@ -966,8 +966,8 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
emit generationProgress(24); emit generationProgress(24);
delete src_event; delete src_event;
delete dest_event; delete dest_event;
// printf("Import Table: %s\n",(const char *)import_name);
// printf("Import Table: %s\n",(const char *)import_name);
sql=QString().sprintf("drop table `%s`",(const char *)import_name); sql=QString().sprintf("drop table `%s`",(const char *)import_name);
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
delete q; delete q;