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

2020-02-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed Q3Socket dependency from the SAS USI switcher driver.
This commit is contained in:
Fred Gleason
2020-02-16 14:36:35 -05:00
parent 8b90256b28
commit 9daedd7f19
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -19604,3 +19604,5 @@
2020-02-16 Fred Gleason <fredg@paravelsystems.com> 2020-02-16 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up the device access mode in the SAS USI switcher * Cleaned up the device access mode in the SAS USI switcher
driver. driver.
2020-02-16 Fred Gleason <fredg@paravelsystems.com>
* Removed Q3Socket dependency from the SAS USI switcher driver.

49
ripcd/sasusi.cpp
View File

@@ -93,13 +93,14 @@ SasUsi::SasUsi(RDMatrix *matrix,QObject *parent)
delete tty; delete tty;
case RDMatrix::TcpPort: case RDMatrix::TcpPort:
sas_socket=new Q3Socket(this); sas_socket=new QTcpSocket(this);
connect(sas_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(sas_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(sas_socket,SIGNAL(connectionClosed()), connect(sas_socket,SIGNAL(disconnected()),
this,SLOT(connectionClosedData())); this,SLOT(connectionClosedData()));
connect(sas_socket,SIGNAL(readyRead()), connect(sas_socket,SIGNAL(readyRead()),
this,SLOT(readyReadData())); this,SLOT(readyReadData()));
connect(sas_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(sas_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(Q)));
ipConnect(); ipConnect();
break; break;
@@ -388,30 +389,30 @@ void SasUsi::readyReadData()
} }
void SasUsi::errorData(int err) void SasUsi::errorData(QAbstractSocket::SocketError err)
{ {
switch((Q3Socket::Error)err) { switch(err) {
case Q3Socket::ErrConnectionRefused: case QAbstractSocket::ConnectionRefusedError:
rda->syslog(LOG_WARNING, rda->syslog(LOG_WARNING,
"connection to SasUsi device at %s:%d refused, attempting reconnect", "connection to SasUsi device at %s:%d refused, attempting reconnect",
(const char *)sas_ipaddress.toString().toUtf8(), (const char *)sas_ipaddress.toString().toUtf8(),
sas_ipport); sas_ipport);
sas_reconnect_timer->start(SASUSI_RECONNECT_INTERVAL,true); sas_reconnect_timer->start(SASUSI_RECONNECT_INTERVAL,true);
break; break;
case Q3Socket::ErrHostNotFound: case QAbstractSocket::HostNotFoundError:
rda->syslog(LOG_WARNING, rda->syslog(LOG_WARNING,
"error on connection to SasUsi device at %s:%d: Host Not Found", "error on connection to SasUsi device at %s:%d: Host Not Found",
(const char *)sas_ipaddress.toString().toUtf8(), (const char *)sas_ipaddress.toString().toUtf8(),
sas_ipport); sas_ipport);
break; break;
case Q3Socket::ErrSocketRead: default:
rda->syslog(LOG_WARNING, rda->syslog(LOG_WARNING,
"error on connection to SasUsi device at %s:%d: Socket Read Error", "received network error %d on connection to SasUsi device at %s:%d",
(const char *)sas_ipaddress.toString().toUtf8(), (const char *)sas_ipaddress.toString().toUtf8(),
sas_ipport); sas_ipport);
break; break;
} }
} }

8
ripcd/sasusi.h
View File

@@ -23,8 +23,9 @@
#include <vector> #include <vector>
#include <q3socket.h> //#include <q3socket.h>
#include <qhostaddress.h> #include <qhostaddress.h>
#include <qtcpsocket.h>
#include <qtimer.h> #include <qtimer.h>
#include <rd.h> #include <rd.h>
@@ -54,7 +55,7 @@ class SasUsi : public Switcher
void connectedData(); void connectedData();
void connectionClosedData(); void connectionClosedData();
void readyReadData(); void readyReadData();
void errorData(int err); void errorData(QAbstractSocket::SocketError err);
private: private:
void SendCommand(char *str); void SendCommand(char *str);
@@ -62,7 +63,8 @@ class SasUsi : public Switcher
void ExecuteMacroCart(unsigned cartnum); void ExecuteMacroCart(unsigned cartnum);
QString PrettifyCommand(const char *cmd) const; QString PrettifyCommand(const char *cmd) const;
RDTTYDevice *sas_device; RDTTYDevice *sas_device;
Q3Socket *sas_socket; QTcpSocket *sas_socket;
// Q3Socket *sas_socket;
char sas_buffer[SASUSI_MAX_LENGTH]; char sas_buffer[SASUSI_MAX_LENGTH];
unsigned sas_ptr; unsigned sas_ptr;
QHostAddress sas_ipaddress; QHostAddress sas_ipaddress;