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

2022-08-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the endpoint naming format for Software Authority
	Protocol devices to match that used in Drouter.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-08-03 11:14:45 -04:00
parent 96e8b9ba29
commit 4af45aa3a7
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23208,3 +23208,6 @@
2022-08-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdcatch(1) that could cause a newly added event
to appear twice in the record list.
2022-08-03 Fred Gleason <fredg@paravelsystems.com>
* Modified the endpoint naming format for Software Authority
Protocol devices to match that used in Drouter.

14
ripcd/swauthority.cpp
View File

@ -339,7 +339,7 @@ void SoftwareAuthority::DispatchCommand()
//
while(f0[0].toInt()>swa_next_endpt) {
sql=QString("insert into `INPUTS` set ")+
"`NAME`='"+tr("[none]")+"',"+
"`NAME`='"+QString::asprintf("%d - ",swa_next_endpt)+tr("[none]")+"',"+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+
QString::asprintf("`MATRIX`=%d,",swa_matrix)+
QString::asprintf("`NUMBER`=%d",swa_next_endpt);
@ -350,10 +350,7 @@ void SoftwareAuthority::DispatchCommand()
//
// Process the actual entry
//
name=f0[1];
if(f0.size()>=7) {
name=f0[6]+": "+f0[2];
}
name=QString::asprintf("%d - ",f0[0].toInt())+f0[2];
sql=QString("insert into `INPUTS` set ")+
"`NAME`='"+RDEscapeString(name)+"',"+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+
@ -399,7 +396,7 @@ void SoftwareAuthority::DispatchCommand()
//
while(f0[0].toInt()>swa_next_endpt) {
sql=QString("insert into `OUTPUTS` set ")+
"`NAME`='"+tr("[none]")+"',"+
"`NAME`='"+QString::asprintf("%d - ",swa_next_endpt)+tr("[none]")+"',"+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+
QString::asprintf("`MATRIX`=%d,",swa_matrix)+
QString::asprintf("`NUMBER`=%d",swa_next_endpt);
@ -410,10 +407,7 @@ void SoftwareAuthority::DispatchCommand()
//
// Process the actual entry
//
name=f0[1];
if(f0.size()>=6) {
name=f0[3]+"/"+f0[5]+": "+f0[2];
}
name=QString::asprintf("%d - ",f0[0].toInt())+f0[2];
sql=QString("insert into `OUTPUTS` set ")+
"`NAME`='"+RDEscapeString(name)+"',"+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+