Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-25 14:50:11 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in the BroadcastTools GPI-16 switcher driver
	that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason
2020-02-14 19:18:03 -05:00
parent fb919b02e9
commit 764ce50952
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

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

10
ripcd/btgpi16.cpp
View File

@@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools GPI-16 // A Rivendell switcher driver for the BroadcastTools GPI-16
// //
// (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
@@ -51,6 +51,7 @@ BtGpi16::BtGpi16(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());
@@ -62,13 +63,6 @@ BtGpi16::BtGpi16(RDMatrix *matrix,QObject *parent)
} }
} }
delete tty; delete tty;
//
// The Poll Timer
//
QTimer *timer=new QTimer(this,"poll_timer");
connect(timer,SIGNAL(timeout()),this,SLOT(processStatus()));
timer->start(BTGPI16_POLL_INTERVAL);
} }

8
ripcd/btgpi16.h
View File

@@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for the BroadcastTools GPI-16 // A Rivendell switcher driver for the BroadcastTools GPI-16
// //
// (C) Copyright 2002-2005,2010,2014,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 BTGPI16_UNIT_ID 0 #define BTGPI16_UNIT_ID 0
#define BTGPI16_POLL_INTERVAL 100
#define BTGPI16_GPIO_PINS 16 #define BTGPI16_GPIO_PINS 16
class BtGpi16 : public Switcher class BtGpi16 : public Switcher
@@ -48,16 +47,11 @@ class BtGpi16 : public Switcher
private slots: private slots:
void processStatus(); void processStatus();
// void gpiOneshotData(int value);
// void gpoOneshotData(int value);
private: private:
RDTTYDevice *bt_device; RDTTYDevice *bt_device;
// RDOneShot *bt_gpi_oneshot;
// RDOneShot *bt_gpo_oneshot;
int bt_matrix; int bt_matrix;
int bt_gpis; int bt_gpis;
// int bt_gpos;
int bt_istate; int bt_istate;
bool bt_gpi_state[BTGPI16_GPIO_PINS]; bool bt_gpi_state[BTGPI16_GPIO_PINS];
bool bt_gpi_mask[BTGPI16_GPIO_PINS]; bool bt_gpi_mask[BTGPI16_GPIO_PINS];