Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-08 16:37:46 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Removed Q3Socket dependency from the WheatNet SLIO switcher
	driver.
	* Removed Q3Socket dependency from the WheatNet LIO switcher
	driver.
This commit is contained in:
Fred Gleason 2020-02-17 09:06:25 -05:00
parent df4e3c9ca7
commit f45bd74bb4
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19618,3 +19618,8 @@
2020-02-17 Fred Gleason <fredg@paravelsystems.com> 2020-02-17 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up the tty device access mode in the vGuest switcher * Cleaned up the tty device access mode in the vGuest switcher
driver. driver.
2020-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed Q3Socket dependency from the WheatNet SLIO switcher
driver.
* Removed Q3Socket dependency from the WheatNet LIO switcher
driver.

9
ripcd/wheatnet_lio.cpp
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for WheatNet LIO // A Rivendell switcher driver for WheatNet LIO
// //
// (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -34,10 +34,11 @@ WheatnetLio::WheatnetLio(RDMatrix *matrix,QObject *parent)
lio_ip_port=matrix->ipPort(RDMatrix::Primary); lio_ip_port=matrix->ipPort(RDMatrix::Primary);
lio_card=matrix->card(); lio_card=matrix->card();
lio_socket=new Q3Socket(this); lio_socket=new QTcpSocket(this);
connect(lio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(lio_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(lio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(lio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(lio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(lio_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
lio_socket->connectToHost(lio_ip_address.toString(),lio_ip_port); lio_socket->connectToHost(lio_ip_address.toString(),lio_ip_port);
lio_poll_timer=new QTimer(this); lio_poll_timer=new QTimer(this);
@ -204,7 +205,7 @@ void WheatnetLio::readyReadData()
} }
void WheatnetLio::errorData(int err) void WheatnetLio::errorData(QAbstractSocket::SocketError err)
{ {
watchdogData(); watchdogData();
} }

8
ripcd/wheatnet_lio.h
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for Wheatnet LIO devices // A Rivendell switcher driver for Wheatnet LIO devices
// //
// (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -24,7 +24,7 @@
#include <vector> #include <vector>
#include <qsignalmapper.h> #include <qsignalmapper.h>
#include <q3socket.h> #include <qtcpsocket.h>
#include <qtimer.h> #include <qtimer.h>
#include <rd.h> #include <rd.h>
@ -52,7 +52,7 @@ class WheatnetLio : public Switcher
private slots: private slots:
void connectedData(); void connectedData();
void readyReadData(); void readyReadData();
void errorData(int err); void errorData(QAbstractSocket::SocketError err);
void resetStateData(int line); void resetStateData(int line);
void pollData(); void pollData();
void watchdogData(); void watchdogData();
@ -63,7 +63,7 @@ class WheatnetLio : public Switcher
void ProcessLioevent(int chan,QString &cmd); void ProcessLioevent(int chan,QString &cmd);
void ProcessCommand(const QString &cmd); void ProcessCommand(const QString &cmd);
void SendCommand(const QString &cmd); void SendCommand(const QString &cmd);
Q3Socket *lio_socket; QTcpSocket *lio_socket;
QTimer *lio_watchdog_timer; QTimer *lio_watchdog_timer;
bool lio_watchdog_active; bool lio_watchdog_active;
QHostAddress lio_ip_address; QHostAddress lio_ip_address;

9
ripcd/wheatnet_slio.cpp
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for WheatNet SLIO // A Rivendell switcher driver for WheatNet SLIO
// //
// (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -33,10 +33,11 @@ WheatnetSlio::WheatnetSlio(RDMatrix *matrix,QObject *parent)
slio_ip_address=matrix->ipAddress(RDMatrix::Primary); slio_ip_address=matrix->ipAddress(RDMatrix::Primary);
slio_ip_port=matrix->ipPort(RDMatrix::Primary); slio_ip_port=matrix->ipPort(RDMatrix::Primary);
slio_socket=new Q3Socket(this); slio_socket=new QTcpSocket(this);
connect(slio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(slio_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(slio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(slio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(slio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(slio_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
slio_socket->connectToHost(slio_ip_address.toString(),slio_ip_port); slio_socket->connectToHost(slio_ip_address.toString(),slio_ip_port);
slio_poll_timer=new QTimer(this); slio_poll_timer=new QTimer(this);
@ -201,7 +202,7 @@ void WheatnetSlio::readyReadData()
} }
void WheatnetSlio::errorData(int err) void WheatnetSlio::errorData(QAbstractSocket::SocketError err)
{ {
watchdogData(); watchdogData();
} }

8
ripcd/wheatnet_slio.h
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for Wheatnet SLIO devices // A Rivendell switcher driver for Wheatnet SLIO devices
// //
// (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -24,7 +24,7 @@
#include <vector> #include <vector>
#include <qsignalmapper.h> #include <qsignalmapper.h>
#include <q3socket.h> #include <qtcpsocket.h>
#include <qtimer.h> #include <qtimer.h>
#include <rd.h> #include <rd.h>
@ -52,7 +52,7 @@ class WheatnetSlio : public Switcher
private slots: private slots:
void connectedData(); void connectedData();
void readyReadData(); void readyReadData();
void errorData(int err); void errorData(QAbstractSocket::SocketError err);
void resetStateData(int line); void resetStateData(int line);
void pollData(); void pollData();
void watchdogData(); void watchdogData();
@ -63,7 +63,7 @@ class WheatnetSlio : public Switcher
void ProcessSlioevent(int chan,QString &cmd); void ProcessSlioevent(int chan,QString &cmd);
void ProcessCommand(const QString &cmd); void ProcessCommand(const QString &cmd);
void SendCommand(const QString &cmd); void SendCommand(const QString &cmd);
Q3Socket *slio_socket; QTcpSocket *slio_socket;
QTimer *slio_watchdog_timer; QTimer *slio_watchdog_timer;
bool slio_watchdog_active; bool slio_watchdog_active;
QHostAddress slio_ip_address; QHostAddress slio_ip_address;