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-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in the BroadcastTools SS 4.2 switcher driver
	that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason 2020-02-14 19:37:03 -05:00
parent 47a0a5a467
commit d6f791be19
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19572,3 +19572,6 @@
2020-02-14 Fred Gleason <fredg@paravelsystems.com> 2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the BroadcastTools SS 4.1 MLR switcher driver * Fixed a regression in the BroadcastTools SS 4.1 MLR switcher driver
that could cause deadlocks and intermittent operation. that could cause deadlocks and intermittent operation.
2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the BroadcastTools SS 4.2 switcher driver
that could cause deadlocks and intermittent operation.

10
ripcd/btss42.cpp
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools SS 4.2 // A Rivendell switcher driver for the BroadcastTools SS 4.2
// //
// (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
@ -53,6 +53,7 @@ BtSs42::BtSs42(RDMatrix *matrix,QObject *parent)
// //
RDTty *tty=new RDTty(rda->station()->name(),matrix->port(RDMatrix::Primary)); RDTty *tty=new RDTty(rda->station()->name(),matrix->port(RDMatrix::Primary));
bt_device=new RDTTYDevice(); bt_device=new RDTTYDevice();
connect(bt_device,SIGNAL(readyRead()),this,SLOT(processStatus()));
if(tty->active()) { if(tty->active()) {
bt_device->setName(tty->port()); bt_device->setName(tty->port());
bt_device->setSpeed(tty->baudRate()); bt_device->setSpeed(tty->baudRate());
@ -69,13 +70,6 @@ BtSs42::BtSs42(RDMatrix *matrix,QObject *parent)
connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int)));
bt_gpo_oneshot=new RDOneShot(this); bt_gpo_oneshot=new RDOneShot(this);
connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int)));
//
// The Poll Timer
//
QTimer *timer=new QTimer(this,"poll_timer");
connect(timer,SIGNAL(timeout()),this,SLOT(processStatus()));
timer->start(BTSS42_POLL_INTERVAL);
} }

3
ripcd/btss42.h
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools SS 4.2 // A Rivendell switcher driver for the BroadcastTools SS 4.2
// //
// (C) Copyright 2002-2005,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
@ -30,7 +30,6 @@
#include <switcher.h> #include <switcher.h>
#define BTSS42_UNIT_ID 0 #define BTSS42_UNIT_ID 0
#define BTSS42_POLL_INTERVAL 100
#define BTSS42_GPIO_PINS 16 #define BTSS42_GPIO_PINS 16
class BtSs42 : public Switcher class BtSs42 : public Switcher