Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-19 22:27:48 +02:00
Code Issues Projects Releases Wiki Activity

2018-12-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a set of enclosing '{}' braces around the JSON-formatted PAD
	output to make it well-formed.
This commit is contained in:
Fred Gleason 2018-12-05 11:33:35 -05:00
parent 9e6fb9f3c0
commit fc0023a0cd
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18097,3 +18097,6 @@
2018-12-04 Fred Gleason <fredg@paravelsystems.com>
* Added an rdrlmd(8) service.
* Implemented JSON-formatted PAD output on TCP port 34289.
2018-12-05 Fred Gleason <fredg@paravelsystems.com>
* Added a set of enclosing '{}' braces around the JSON-formatted PAD
output to make it well-formed.

36
lib/rdlogplay.cpp
View File

@ -2961,46 +2961,48 @@ void RDLogPlay::SendNowNext()
//
// RLM2
//
play_pad_socket->write(QString("\"padUpdate\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("dateTime",QDateTime::currentDateTime(),4).toUtf8());
play_pad_socket->write(RDJsonField("logMachine",play_id,4));
play_pad_socket->write(RDJsonField("onairFlag",play_onair_flag,4));
play_pad_socket->write(RDJsonField("logMode",RDAirPlayConf::logModeText(play_op_mode),4));
play_pad_socket->write(QString("{\r\n").toUtf8());
play_pad_socket->write(QString(" \"padUpdate\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("dateTime",QDateTime::currentDateTime(),8).toUtf8());
play_pad_socket->write(RDJsonField("logMachine",play_id,8));
play_pad_socket->write(RDJsonField("onairFlag",play_onair_flag,8));
play_pad_socket->write(RDJsonField("logMode",RDAirPlayConf::logModeText(play_op_mode),8));
//
// Service
//
RDSvc *svc=new RDSvc(svcname,rda->station(),rda->config(),this);
play_pad_socket->write(QString(" \"service\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("name",svcname,8).toUtf8());
play_pad_socket->write(QString(" \"service\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("name",svcname,12).toUtf8());
play_pad_socket->
write(RDJsonField("description",svc->description(),8).toUtf8());
write(RDJsonField("description",svc->description(),12).toUtf8());
play_pad_socket->
write(RDJsonField("programCode",svc->programCode(),8,true).toUtf8());
play_pad_socket->write(QString(" },\r\n").toUtf8());
write(RDJsonField("programCode",svc->programCode(),12,true).toUtf8());
play_pad_socket->write(QString(" },\r\n").toUtf8());
delete svc;
//
// Log
//
play_pad_socket->write(QString(" \"log\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("name",logName(),8,true).toUtf8());
play_pad_socket->write(QString(" },\r\n").toUtf8());
play_pad_socket->write(QString(" \"log\": {\r\n").toUtf8());
play_pad_socket->write(RDJsonField("name",logName(),12,true).toUtf8());
play_pad_socket->write(QString(" },\r\n").toUtf8());
//
// Now
//
play_pad_socket->write(GetPadJson("now",logline[0],4,false).toUtf8());
play_pad_socket->write(GetPadJson("now",logline[0],8,false).toUtf8());
//
// Next
//
play_pad_socket->write(GetPadJson("next",logline[1],4,true).toUtf8());
play_pad_socket->write(GetPadJson("next",logline[1],8,true).toUtf8());
//
// Commit the update
//
play_pad_socket->write("}\r\n\r\n",5);
play_pad_socket->write(QString(" }\r\n").toUtf8());
play_pad_socket->write(QString("}\r\n\r\n").toUtf8());
//
// Old-style RLM Hosts
@ -3039,7 +3041,7 @@ QString RDLogPlay::GetPadJson(const QString &name,RDLogLine *ll,
QString ret;
if(ll==NULL) {
ret=RDJsonNullField(name,4,final);
ret=RDJsonNullField(name,padding,final);
}
else {
ret+=RDJsonPadding(padding)+"\""+name+"\": {\r\n";