Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2018-07-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up SQL quieries in 'ripcd/' to ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason
2018-07-18 20:58:22 +00:00
parent 6e2b2a7e0b
commit f7bae36307
12 changed files with 215 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
ripcd/livewire_lwrpaudio.cpp
View File

@@ -22,6 +22,7 @@
#include <rdapplication.h>
#include <rddb.h>
#include <rdescape_string.h>
#include "globals.h"
#include "livewire_lwrpaudio.h"
@@ -41,10 +42,14 @@ LiveWireLwrpAudio::LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent)
//
// Load The Node List
//
sql=QString().sprintf("select HOSTNAME,TCP_PORT,PASSWORD,BASE_OUTPUT \
from SWITCHER_NODES where (STATION_NAME=\"%s\")&&\
(MATRIX=%d)",(const char *)livewire_stationname,
livewire_matrix);
sql=QString("select ")+
"HOSTNAME,"+ // 00
"TCP_PORT,"+ // 01
"PASSWORD,"+ // 02
"BASE_OUTPUT "+ // 03
"from SWITCHER_NODES where "+
"(STATION_NAME=\""+RDEscapeString(livewire_stationname)+"\")&&"+
QString().sprintf("(MATRIX=%d)",livewire_matrix);
q=new RDSqlQuery(sql);
while(q->next()) {
livewire_nodes.push_back(new RDLiveWire(livewire_nodes.size(),this));
@@ -58,20 +63,6 @@ LiveWireLwrpAudio::LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent)
SIGNAL(destinationChanged(unsigned,RDLiveWireDestination *)),
this,
SLOT(destinationChangedData(unsigned,RDLiveWireDestination *)));
/*
connect(livewire_nodes.back(),
SIGNAL(gpoConfigChanged(unsigned,unsigned,unsigned)),
this,
SLOT(gpoConfigChangedData(unsigned,unsigned,unsigned)));
connect(livewire_nodes.back(),
SIGNAL(gpiChanged(unsigned,unsigned,unsigned,bool)),
this,
SLOT(gpiChangedData(unsigned,unsigned,unsigned,bool)));
connect(livewire_nodes.back(),
SIGNAL(gpoChanged(unsigned,unsigned,unsigned,bool)),
this,
SLOT(gpoChangedData(unsigned,unsigned,unsigned,bool)));
*/
connect(livewire_nodes.back(),
SIGNAL(watchdogStateChanged(unsigned,const QString &)),
this,SLOT(watchdogStateChangedData(unsigned,const QString &)));
@@ -187,36 +178,24 @@ void LiveWireLwrpAudio::sourceChangedData(unsigned id,RDLiveWireSource *src)
QString sql;
RDSqlQuery *q;
sql=QString().sprintf("delete from INPUTS where \
(STATION_NAME=\"%s\")&&\
(MATRIX=%d)&&\
(NODE_HOSTNAME=\"%s\")&&\
(NODE_TCP_PORT=%d)&&\
(NODE_SLOT=%d)",
(const char *)livewire_stationname,
livewire_matrix,
(const char *)livewire_nodes[id]->hostname(),
livewire_nodes[id]->tcpPort(),
src->slotNumber());
sql=QString("delete from INPUTS where ")+
"(STATION_NAME=\""+RDEscapeString(livewire_stationname)+"\")&&"+
QString().sprintf("(MATRIX=%d)&&",livewire_matrix)+
"(NODE_HOSTNAME=\""+RDEscapeString(livewire_nodes[id]->hostname())+"\")&&"+
QString().sprintf("(NODE_TCP_PORT=%d)&&",livewire_nodes[id]->tcpPort())+
QString().sprintf("(NODE_SLOT=%d)",src->slotNumber());
q=new RDSqlQuery(sql);
delete q;
if(src->rtpEnabled()) {
sql=QString().sprintf("insert into INPUTS set \
STATION_NAME=\"%s\",\
MATRIX=%d,\
NODE_HOSTNAME=\"%s\",\
NODE_TCP_PORT=%d,\
NODE_SLOT=%d,\
NAME=\"%s\",\
NUMBER=%d",
(const char *)livewire_stationname,
livewire_matrix,
(const char *)livewire_nodes[id]->hostname(),
livewire_nodes[id]->tcpPort(),
src->slotNumber(),
(const char *)src->primaryName(),
src->channelNumber());
sql=QString("insert into INPUTS set ")+
"STATION_NAME=\""+RDEscapeString(livewire_stationname)+"\","+
QString().sprintf("MATRIX=%d,",livewire_matrix)+
"NODE_HOSTNAME=\""+RDEscapeString(livewire_nodes[id]->hostname())+"\","+
QString().sprintf("NODE_TCP_PORT=%d,",livewire_nodes[id]->tcpPort())+
QString().sprintf("NODE_SLOT=%d,",src->slotNumber())+
"NAME=\""+RDEscapeString(src->primaryName())+"\","+
QString().sprintf("NUMBER=%d",src->channelNumber());
q=new RDSqlQuery(sql);
delete q;
}
@@ -228,35 +207,24 @@ void LiveWireLwrpAudio::destinationChangedData(unsigned id,RDLiveWireDestination
QString sql;
RDSqlQuery *q;
sql=QString().sprintf("delete from OUTPUTS where \
(STATION_NAME=\"%s\")&&\
(MATRIX=%d)&&\
(NODE_HOSTNAME=\"%s\")&&\
(NODE_TCP_PORT=%d)&&\
(NODE_SLOT=%d)",
(const char *)livewire_stationname,
livewire_matrix,
(const char *)livewire_nodes[id]->hostname(),
livewire_nodes[id]->tcpPort(),
dst->slotNumber());
sql=QString("delete from OUTPUTS where ")+
"(STATION_NAME=\""+RDEscapeString(livewire_stationname)+"\")&&"+
QString().sprintf("(MATRIX=%d)&&",livewire_matrix)+
"(NODE_HOSTNAME=\""+RDEscapeString(livewire_nodes[id]->hostname())+"\")&&"+
QString().sprintf("(NODE_TCP_PORT=%d)&&",livewire_nodes[id]->tcpPort())+
QString().sprintf("(NODE_SLOT=%d)",dst->slotNumber());
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("insert into OUTPUTS set \
STATION_NAME=\"%s\",\
MATRIX=%d,\
NODE_HOSTNAME=\"%s\",\
NODE_TCP_PORT=%d,\
NODE_SLOT=%d,\
NAME=\"%s\",\
NUMBER=%d",
(const char *)livewire_stationname,
livewire_matrix,
(const char *)livewire_nodes[id]->hostname(),
livewire_nodes[id]->tcpPort(),
dst->slotNumber(),
(const char *)dst->primaryName(),
livewire_nodes[id]->baseOutput()+dst->slotNumber()-1);
sql=QString("insert into OUTPUTS set ")+
"STATION_NAME=\""+RDEscapeString(livewire_stationname)+"\","+
QString().sprintf("MATRIX=%d,",livewire_matrix)+
"NODE_HOSTNAME=\""+RDEscapeString(livewire_nodes[id]->hostname())+"\","+
QString().sprintf("NODE_TCP_PORT=%d,",livewire_nodes[id]->tcpPort())+
QString().sprintf("NODE_SLOT=%d,",dst->slotNumber())+
"NAME=\""+RDEscapeString(dst->primaryName())+"\","+
QString().sprintf("NUMBER=%d",
livewire_nodes[id]->baseOutput()+dst->slotNumber()-1);
q=new RDSqlQuery(sql);
delete q;
}