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

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

Browse Source 
* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ripcd/quartz1.cpp
View File

@@ -80,12 +80,12 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent)
sas_device[i]->setSpeed(tty->baudRate());
sas_device[i]->setWordLength(tty->dataBits());
sas_device[i]->setParity(tty->parity());
sas_device[i]->open(IO_Raw|IO_ReadWrite);
sas_device[i]->open(QIODevice::Unbuffered|QIODevice::ReadWrite);
}
delete tty;
case RDMatrix::TcpPort:
sas_socket[i]=new QSocket(this,"sas_socket");
sas_socket[i]=new Q3Socket(this,"sas_socket");
connected_mapper->setMapping(sas_socket[i],i);
connect(sas_socket[i],SIGNAL(connected()),
connected_mapper,SLOT(map()));
@@ -211,8 +211,8 @@ void Quartz1::connectionClosedData(int conn)
void Quartz1::errorData(int conn,int err)
{
switch((QSocket::Error)err) {
case QSocket::ErrConnectionRefused:
switch((Q3Socket::Error)err) {
case Q3Socket::ErrConnectionRefused:
LogLine(RDConfig::LogNotice,QString().sprintf(
"Connection to Quartz1 device at %s:%d refused, attempting reconnect",
(const char *)sas_ipaddress[conn].toString(),
@@ -220,14 +220,14 @@ void Quartz1::errorData(int conn,int err)
sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL,true);
break;
case QSocket::ErrHostNotFound:
case Q3Socket::ErrHostNotFound:
LogLine(RDConfig::LogWarning,QString().sprintf(
"Error on connection to Quartz1 device at %s:%d: Host Not Found",
(const char *)sas_ipaddress[conn].toString(),
sas_ipport[conn]));
break;
case QSocket::ErrSocketRead:
case Q3Socket::ErrSocketRead:
LogLine(RDConfig::LogWarning,QString().sprintf(
"Error on connection to Quartz1 device at %s:%d: Socket Read Error",
(const char *)sas_ipaddress[conn].toString(),