diff --git a/ChangeLog b/ChangeLog index 042b2d9f..ef1d2f8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19572,3 +19572,6 @@ 2020-02-14 Fred Gleason * Fixed a regression in the BroadcastTools SS 4.1 MLR switcher driver that could cause deadlocks and intermittent operation. +2020-02-14 Fred Gleason + * Fixed a regression in the BroadcastTools SS 4.2 switcher driver + that could cause deadlocks and intermittent operation. diff --git a/ripcd/btss42.cpp b/ripcd/btss42.cpp index 20957628..0593afbd 100644 --- a/ripcd/btss42.cpp +++ b/ripcd/btss42.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.2 // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -53,6 +53,7 @@ BtSs42::BtSs42(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(processStatus())); if(tty->active()) { bt_device->setName(tty->port()); 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))); 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(processStatus())); - timer->start(BTSS42_POLL_INTERVAL); } diff --git a/ripcd/btss42.h b/ripcd/btss42.h index 34023c7d..76a732fd 100644 --- a/ripcd/btss42.h +++ b/ripcd/btss42.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.2 // -// (C) Copyright 2002-2005,2016 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 #define BTSS42_UNIT_ID 0 -#define BTSS42_POLL_INTERVAL 100 #define BTSS42_GPIO_PINS 16 class BtSs42 : public Switcher