Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-31 22:24:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Removed Q3Socket dependency from the Broadcast Tools MLR>>Web
	switcher driver.
This commit is contained in:
Fred Gleason
2020-02-17 10:06:18 -05:00
parent 638c5779ac
commit ca949a8001
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

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

9
ripcd/btu41mlrweb.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell switcher driver for the BroadcastTools Universal 4.1 MLR>>Web
//
// (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
// it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@ BtU41MlrWeb::BtU41MlrWeb(RDMatrix *matrix,QObject *parent)
bt_gpi_states[i]=false;
}
bt_socket=new Q3Socket(this);
bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
bt_socket->connectToHost(bt_ip_address.toString(),bt_ip_port);
bt_keepalive_timer=new QTimer(this);
@@ -148,7 +149,7 @@ void BtU41MlrWeb::readyReadData()
}
void BtU41MlrWeb::errorData(int err)
void BtU41MlrWeb::errorData(QAbstractSocket::SocketError err)
{
watchdogData();
}

8
ripcd/btu41mlrweb.h
View File

@@ -2,7 +2,7 @@
//
// Rivendell switcher driver for the BroadcastTools Universal 4.1 MLR>>Web
//
// (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
// it under the terms of the GNU General Public License version 2 as
@@ -24,7 +24,7 @@
#include <vector>
#include <qsignalmapper.h>
#include <q3socket.h>
#include <qtcpsocket.h>
#include <qtimer.h>
#include <rd.h>
@@ -56,14 +56,14 @@ class BtU41MlrWeb : public Switcher
private slots:
void connectedData();
void readyReadData();
void errorData(int err);
void errorData(QAbstractSocket::SocketError err);
void keepaliveData();
void watchdogData();
private:
void ProcessCommand(const QString &cmd);
void SendCommand(const QString &cmd);
Q3Socket *bt_socket;
QTcpSocket *bt_socket;
QTimer *bt_watchdog_timer;
bool bt_watchdog_active;
QHostAddress bt_ip_address;