Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-13 16:19:36 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in the BroadcastTools ADMS 44.22 switcher driver
	that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason 2020-02-14 19:14:16 -05:00
parent 5c65965f15
commit fb919b02e9
3 changed files with 6 additions and 10 deletions

3
ChangeLog

@ -19551,3 +19551,6 @@
2020-02-14 Fred Gleason <fredg@paravelsystems.com> 2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the BroadcastTools ACS8.2 switcher driver * Fixed a regression in the BroadcastTools ACS8.2 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 ADMS 44.22 switcher driver
that could cause deadlocks and intermittent operation.

10
ripcd/btadms4422.cpp

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools ADMS 44.22 // A Rivendell switcher driver for the BroadcastTools ADMS 44.22
// //
// (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
@ -54,6 +54,7 @@ BtAdms4422::BtAdms4422(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());
@ -79,13 +80,6 @@ BtAdms4422::BtAdms4422(RDMatrix *matrix,QObject *parent)
bt_gpo_oneshot=new RDOneShot(this); bt_gpo_oneshot=new RDOneShot(this);
connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), connect(bt_gpo_oneshot,SIGNAL(timeout(void *)),
this,SLOT(gpoOneshotData(int))); this,SLOT(gpoOneshotData(int)));
//
// The Poll Timer
//
QTimer *timer=new QTimer(this);
connect(timer,SIGNAL(timeout()),this,SLOT(processStatus()));
timer->start(BTADMS4422_POLL_INTERVAL);
} }

3
ripcd/btadms4422.h

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools ADMS 44.22 // A Rivendell switcher driver for the BroadcastTools ADMS 44.22
// //
// (C) Copyright 2002-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 BTADMS4422_UNIT_ID 0 #define BTADMS4422_UNIT_ID 0
#define BTADMS4422_POLL_INTERVAL 100
#define BTADMS4422_GPI_PINS 16 #define BTADMS4422_GPI_PINS 16
class BtAdms4422 : public Switcher class BtAdms4422 : public Switcher