Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-07 01:13:50 +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.1 MLR switcher driver
	that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason 2020-02-14 19:34:12 -05:00
parent 2039c73bdc
commit 47a0a5a467
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

@ -19569,3 +19569,6 @@
2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up the device access mode in the BroadcastTools SS2.1
switcher driver.
2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the BroadcastTools SS 4.1 MLR switcher driver
that could cause deadlocks and intermittent operation.

10
ripcd/btss41mlr.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the BroadcastTools SS 4.1 MLR
//
// (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
// it under the terms of the GNU General Public License version 2 as
@ -54,6 +54,7 @@ BtSs41Mlr::BtSs41Mlr(RDMatrix *matrix,QObject *parent)
//
RDTty *tty=new RDTty(rda->station()->name(),matrix->port(RDMatrix::Primary));
bt_device=new RDTTYDevice();
connect(bt_device,SIGNAL(readyRead()),this,SLOT(readyReadData()));
if(tty->active()) {
bt_device->setName(tty->port());
bt_device->setSpeed(tty->baudRate());
@ -70,13 +71,6 @@ BtSs41Mlr::BtSs41Mlr(RDMatrix *matrix,QObject *parent)
connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int)));
bt_gpo_oneshot=new RDOneShot(this);
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(readyReadData()));
timer->start(BTSS41MLR_POLL_INTERVAL);
}

3
ripcd/btss41mlr.h
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the BroadcastTools SS 4.1 MLR
//
// (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
// it under the terms of the GNU General Public License version 2 as
@ -30,7 +30,6 @@
#include <switcher.h>
#define BTSS41MLR_UNIT_ID 0
#define BTSS41MLR_POLL_INTERVAL 100
#define BTSS41MLR_GPIO_PINS 16
class BtSs41Mlr : public Switcher