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

2023-01-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlogmanager(1) that caused the slop factors for
	inline traffic events to fail to be applied when importing a traffic
	log.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-01-26 11:16:08 -05:00
parent 100e5dc025
commit 3bebeee906
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -23948,3 +23948,7 @@
2023-01-24 Fred Gleason <fredg@paravelsystems.com> 2023-01-24 Fred Gleason <fredg@paravelsystems.com>
* Added more detail to data transfer errors generated by the * Added more detail to data transfer errors generated by the
podcasting subsystem. podcasting subsystem.
2023-01-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused the slop factors for
inline traffic events to fail to be applied when importing a traffic
log.

34
lib/rdevent_line.cpp
View File

@ -963,6 +963,7 @@ void RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname,
{ {
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
RDSqlQuery *q1;
RDLogLine *logline=NULL; RDLogLine *logline=NULL;
RDLog::Source log_src=RDLog::SourceMusic; RDLog::Source log_src=RDLog::SourceMusic;
@ -990,6 +991,35 @@ void RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname,
int grace_time=link_logline->graceTime(); int grace_time=link_logline->graceTime();
QTime time=link_logline->startTime(RDLogLine::Logged); QTime time=link_logline->startTime(RDLogLine::Logged);
//
// Get slop factors for inline traffic breaks
//
int inline_start_slop=0;
int inline_end_slop=0;
if(event_import_source==RDEventLine::Music) {
sql=QString("select ")+
"`NESTED_EVENT` "+ // 00
"from `EVENTS` where "+
"`NAME`='"+RDEscapeString(event_name)+"'";
q=new RDSqlQuery(sql);
if(q->first()) {
if(!q->value(0).toString().trimmed().isEmpty()) {
sql=QString("select ")+
"`START_SLOP`,"+ // 00
"`END_SLOP` "+ // 01
"from `EVENTS` where "+
"`NAME`='"+RDEscapeString(q->value(0).toString().trimmed())+"'";
q1=new RDSqlQuery(sql);
if(q1->first()) {
inline_start_slop=q1->value(0).toInt();
inline_end_slop=q1->value(1).toInt();
}
delete q1;
}
}
delete q;
}
// //
// Insert Parent Link // Insert Parent Link
// //
@ -1079,8 +1109,8 @@ void RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname,
logline->setLinkEventName(event_nested_event); logline->setLinkEventName(event_nested_event);
logline->setLinkStartTime(q->value(9).toTime()); logline->setLinkStartTime(q->value(9).toTime());
logline->setLinkLength(q->value(10).toInt()); logline->setLinkLength(q->value(10).toInt());
logline->setLinkStartSlop(link_logline->linkStartSlop()); logline->setLinkStartSlop(inline_start_slop);
logline->setLinkEndSlop(link_logline->linkEndSlop()); logline->setLinkEndSlop(inline_end_slop);
logline->setLinkId(link_logline->linkId()); logline->setLinkId(link_logline->linkId());
logline->setLinkEmbedded(true); logline->setLinkEmbedded(true);
} }