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

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

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ripcd/quartz1.cpp
View File

@@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the Quartz Type 1 Switcher Protocol
//
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <syslog.h>
#include <qsignalmapper.h>
#include <rdapplication.h>
@@ -59,6 +56,7 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent)
connect(mapper,SIGNAL(mapped(int)),this,SLOT(ipConnect(int)));
for(int i=0;i<2;i++) {
sas_reconnect_timer[i]=new QTimer(this);
sas_reconnect_timer[i]->setSingleShot(true);
mapper->setMapping(sas_reconnect_timer[i],i);
connect(sas_reconnect_timer[i],SIGNAL(timeout()),mapper,SLOT(map()));
}
@@ -206,7 +204,7 @@ void Quartz1::connectionClosedData(int conn)
"connection to Quartz1 device at %s:%d closed unexpectedly, attempting reconnect",
(const char *)sas_ipaddress[conn].toString().toUtf8(),
sas_ipport[conn]);
sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL,true);
sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL);
}
@@ -218,7 +216,7 @@ void Quartz1::errorData(int conn,QAbstractSocket::SocketError err)
"connection to Quartz1 device at %s:%d refused, attempting reconnect",
(const char *)sas_ipaddress[conn].toString().toUtf8(),
sas_ipport[conn]);
sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL,true);
sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL);
break;
case QAbstractSocket::HostNotFoundError:
@@ -261,7 +259,7 @@ void Quartz1::SendCommand(const char *str)
break;
case RDMatrix::TcpPort:
sas_socket[i]->writeBlock(str,strlen(str));
sas_socket[i]->write(str,strlen(str));
break;
case RDMatrix::NoPort: