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

2024-02-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'eventType' field to the PAD JSON schema.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2024-02-18 15:03:29 -05:00
parent 49516407ae
commit b7c725756c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24601,3 +24601,5 @@
2024-02-18 Fred Gleason <fredg@paravelsystems.com> 2024-02-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused invalid PAD JSON * Fixed a regression in rdairplay(1) that caused invalid PAD JSON
to be emitted when processing a Chain event. to be emitted when processing a Chain event.
2024-02-18 Fred Gleason <fredg@paravelsystems.com>
* Added an 'eventType' field to the PAD JSON schema.

16
lib/rdlogplay.cpp
View File

@ -3317,12 +3317,20 @@ QString RDLogPlay::GetPadJson(const QString &name,RDLogLine *ll,
} }
ret+=RDJsonField("lineNumber",line,4+padding); ret+=RDJsonField("lineNumber",line,4+padding);
ret+=RDJsonField("lineId",ll->id(),4+padding); ret+=RDJsonField("lineId",ll->id(),4+padding);
ret+=RDJsonField("cartNumber",ll->cartNumber(),4+padding); ret+=RDJsonField("eventType",RDLogLine::typeText(ll->type()),4+padding);
ret+=RDJsonField("cartType",RDCart::typeText(ll->cartType()),4+padding); if(ll->type()==RDLogLine::Cart) {
if(ll->cartType()==RDCart::Audio) { ret+=RDJsonField("cartNumber",ll->cartNumber(),4+padding);
ret+=RDJsonField("cutNumber",ll->cutNumber(),4+padding); ret+=RDJsonField("cartType",RDCart::typeText(ll->cartType()),4+padding);
if(ll->cartType()==RDCart::Audio) {
ret+=RDJsonField("cutNumber",ll->cutNumber(),4+padding);
}
else {
ret+=RDJsonNullField("cutNumber",4+padding);
}
} }
else { else {
ret+=RDJsonNullField("cartNumber",4+padding);
ret+=RDJsonNullField("cartType",4+padding);
ret+=RDJsonNullField("cutNumber",4+padding); ret+=RDJsonNullField("cutNumber",4+padding);
} }
if(ll->useEventLength()) { if(ll->useEventLength()) {