Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 22:43:11 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Removed Q3Socket dependency from the Broadcast Tools Sentinel4Web
	switcher driver.
This commit is contained in:
Fred Gleason 2020-02-17 10:01:13 -05:00
parent b891162ab6
commit 638c5779ac
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19633,3 +19633,6 @@
* Removed Q3Socket dependency from the Quartz 1 switcher driver. * Removed Q3Socket dependency from the Quartz 1 switcher driver.
2020-02-17 Fred Gleason <fredg@paravelsystems.com> 2020-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed Q3Socket dependency from the Harlond switcher driver. * Removed Q3Socket dependency from the Harlond switcher driver.
2020-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed Q3Socket dependency from the Broadcast Tools Sentinel4Web
switcher driver.

14
ripcd/btsentinel4web.cpp
View File

@ -2,7 +2,7 @@
// //
// Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-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
@ -36,9 +36,10 @@ BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent)
// //
// Socket // Socket
// //
bt_socket=new Q3Socket(this); bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
// //
@ -139,7 +140,7 @@ void BtSentinel4Web::connectedData()
} }
void BtSentinel4Web::errorData(int err) void BtSentinel4Web::errorData(QAbstractSocket::SocketError err)
{ {
watchdogData(); watchdogData();
} }
@ -167,9 +168,10 @@ void BtSentinel4Web::watchdogData()
void BtSentinel4Web::watchdogResetData() void BtSentinel4Web::watchdogResetData()
{ {
delete bt_socket; delete bt_socket;
bt_socket=new Q3Socket(this); bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
bt_socket->connectToHost(bt_address.toString(),bt_port); bt_socket->connectToHost(bt_address.toString(),bt_port);

8
ripcd/btsentinel4web.h
View File

@ -2,7 +2,7 @@
// //
// Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher
// //
// (C) Copyright 2002-2013,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-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
@ -25,8 +25,8 @@
#include <vector> #include <vector>
#include <q3socket.h>
#include <qhostaddress.h> #include <qhostaddress.h>
#include <qtcpsocket.h>
#include <qtimer.h> #include <qtimer.h>
#include <rd.h> #include <rd.h>
@ -56,13 +56,13 @@ class BtSentinel4Web : public Switcher
private slots: private slots:
void connectedData(); void connectedData();
void errorData(int err); void errorData(QAbstractSocket::SocketError err);
void readyReadData(); void readyReadData();
void watchdogData(); void watchdogData();
void watchdogResetData(); void watchdogResetData();
private: private:
Q3Socket *bt_socket; QTcpSocket *bt_socket;
QHostAddress bt_address; QHostAddress bt_address;
uint16_t bt_port; uint16_t bt_port;
QTimer *bt_watchdog_timer; QTimer *bt_watchdog_timer;