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

2021-02-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Q3SocketDevice dependency from 'RDCae'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-17 10:54:30 -05:00
parent c5c903ede7
commit b2f8532e25
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21170,3 +21170,5 @@
* Removed the 'Q3Signal' dependency from 'RDCut'. * Removed the 'Q3Signal' dependency from 'RDCut'.
2021-02-17 Fred Gleason <fredg@paravelsystems.com> 2021-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed the Q3SocketDevice dependency for metering data 'RDCae'. * Removed the Q3SocketDevice dependency for metering data 'RDCae'.
2021-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed the Q3SocketDevice dependency from 'RDCae'.

38
lib/rdcae.cpp
View File

@ -19,8 +19,11 @@
// //
#include <ctype.h> #include <ctype.h>
#include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <syslog.h> #include <syslog.h>
@ -33,6 +36,8 @@
RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent) RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
: QObject(parent) : QObject(parent)
{ {
int flags=-1;
cae_station=station; cae_station=station;
cae_config=config; cae_config=config;
cae_connected=false; cae_connected=false;
@ -42,8 +47,17 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
// //
// TCP Connection // TCP Connection
// //
cae_socket=new Q3SocketDevice(Q3SocketDevice::Stream); if((cae_socket=socket(AF_INET,SOCK_STREAM,0))<0) {
cae_socket->setBlocking(false); rda->syslog(LOG_WARNING,"unable to allocate TCP socket [%s]",
strerror(errno));
}
if((flags=fcntl(cae_socket,F_GETFL,NULL))>=0) {
flags=flags|O_NONBLOCK;
if(fcntl(cae_socket,F_SETFL,flags)<0) {
rda->syslog(LOG_WARNING,"unable to set TCP socket to non-blocking [%s]",
strerror(errno));
}
}
// //
// Meter Connection // Meter Connection
@ -86,20 +100,24 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
RDCae::~RDCae() { RDCae::~RDCae() {
delete cae_socket; close(cae_socket);
} }
void RDCae::connectHost() void RDCae::connectHost()
{ {
int count=10; int count=10;
// QHostAddress addr; QTimer *timer=new QTimer(this);
QTimer *timer=new QTimer(this,"read_timer"); struct sockaddr_in sa;
connect(timer,SIGNAL(timeout()),this,SLOT(readyData())); connect(timer,SIGNAL(timeout()),this,SLOT(readyData()));
timer->start(CAE_POLL_INTERVAL); timer->start(CAE_POLL_INTERVAL);
while((!cae_socket->connect(cae_station->caeAddress(cae_config), memset(&sa,0,sizeof(sa));
CAED_TCP_PORT))&&(--count>0)) { sa.sin_family=AF_INET;
sa.sin_port=htons(CAED_TCP_PORT);
sa.sin_addr.s_addr=htonl(cae_station->caeAddress(cae_config).toIPv4Address());
while((::connect(cae_socket,(struct sockaddr *)(&sa),sizeof(sa))!=0)&&
(--count>0)) {
usleep(100000); usleep(100000);
} }
usleep(100000); usleep(100000);
@ -389,7 +407,7 @@ void RDCae::readyData(int *stream,int *handle,QString name)
delayed_cmds.clear(); delayed_cmds.clear();
} }
while((c=cae_socket->readBlock(buf,256))>0) { while((c=read(cae_socket,buf,256))>0) {
buf[c]=0; buf[c]=0;
for(int i=0;i<c;i++) { for(int i=0;i<c;i++) {
if(buf[i]==' ') { if(buf[i]==' ') {
@ -433,7 +451,7 @@ void RDCae::readyData(int *stream,int *handle,QString name)
} }
argnum=0; argnum=0;
argptr=0; argptr=0;
if(cae_socket==NULL) { if(cae_socket==-1) {
return; return;
} }
} }
@ -471,7 +489,7 @@ void RDCae::clockData()
void RDCae::SendCommand(QString cmd) void RDCae::SendCommand(QString cmd)
{ {
cae_socket->writeBlock((const char *)cmd,cmd.length()); write(cae_socket,cmd.toUtf8(),cmd.toUtf8().length());
} }

4
lib/rdcae.h
View File

@ -21,8 +21,6 @@
#ifndef RDCAE_H #ifndef RDCAE_H
#define RDCAE_H #define RDCAE_H
#include <q3socketdevice.h>
#include <QList> #include <QList>
#include <QObject> #include <QObject>
#include <QUdpSocket> #include <QUdpSocket>
@ -103,7 +101,7 @@ class RDCae : public QObject
int StreamNumber(const char *arg); int StreamNumber(const char *arg);
int GetHandle(const char *arg); int GetHandle(const char *arg);
void UpdateMeters(); void UpdateMeters();
Q3SocketDevice *cae_socket; int cae_socket;
bool debug; bool debug;
char args[CAE_MAX_ARGS][CAE_MAX_LENGTH]; char args[CAE_MAX_ARGS][CAE_MAX_LENGTH];
int argnum; int argnum;