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

* 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

View File

@ -24601,3 +24601,5 @@
2024-02-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused invalid PAD JSON
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.

View File

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