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 SS16.4 switcher driver
	that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason 2020-02-14 17:28:24 -05:00
parent 532dd9aef8
commit fa894996a9
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19533,3 +19533,6 @@
* Cleaned up a compiler warning in 'lib/rdcae.cpp'. * Cleaned up a compiler warning in 'lib/rdcae.cpp'.
2020-02-07 Fred Gleason <fredg@paravelsystems.com> 2020-02-07 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.1int1. * Incremented the package version to 3.2.1int1.
2020-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the BroadcastTools SS16.4 switcher driver
that could cause deadlocks and intermittent operation.

2
lib/rdttydevice.cpp
View File

@ -55,6 +55,8 @@ bool RDTTYDevice::open(QIODevice::OpenMode mode)
int flags=O_NONBLOCK|O_NOCTTY; int flags=O_NONBLOCK|O_NOCTTY;
struct termios term; struct termios term;
QIODevice::open(mode);
tty_mode=mode; tty_mode=mode;
if((mode&QIODevice::ReadWrite)==QIODevice::ReadWrite) { if((mode&QIODevice::ReadWrite)==QIODevice::ReadWrite) {
flags|=O_RDWR; flags|=O_RDWR;

8
ripcd/btss164.cpp
View File

@ -53,6 +53,7 @@ BtSs164::BtSs164(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 @@ BtSs164::BtSs164(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(BTSS164_POLL_INTERVAL);
} }