kopia lustrzana https://gitlab.com/eliggett/wfview
Make RT/PA a subclass of audioHandler
rodzic
bcde69c92b
commit
b3f611543c
|
@ -18,6 +18,7 @@
|
||||||
/* Logarithmic taper for volume control */
|
/* Logarithmic taper for volume control */
|
||||||
#include "audiotaper.h"
|
#include "audiotaper.h"
|
||||||
|
|
||||||
|
#include "audiohandler.h"
|
||||||
|
|
||||||
/* Audio converter class*/
|
/* Audio converter class*/
|
||||||
#include "audioconverter.h"
|
#include "audioconverter.h"
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
|
||||||
class paHandler : public QObject
|
class paHandler : public audioHandler
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|
|
@ -25,14 +25,14 @@
|
||||||
/* Logarithmic taper for volume control */
|
/* Logarithmic taper for volume control */
|
||||||
#include "audiotaper.h"
|
#include "audiotaper.h"
|
||||||
|
|
||||||
|
#include "audiohandler.h"
|
||||||
/* Audio converter class*/
|
/* Audio converter class*/
|
||||||
#include "audioconverter.h"
|
#include "audioconverter.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
|
||||||
class rtHandler : public QObject
|
class rtHandler : public audioHandler
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|
|
@ -69,10 +69,10 @@ private:
|
||||||
|
|
||||||
uint16_t sendAudioSeq = 0;
|
uint16_t sendAudioSeq = 0;
|
||||||
|
|
||||||
QObject* rxaudio = Q_NULLPTR;
|
audioHandler* rxaudio = Q_NULLPTR;
|
||||||
QThread* rxAudioThread = Q_NULLPTR;
|
QThread* rxAudioThread = Q_NULLPTR;
|
||||||
|
|
||||||
QObject* txaudio = Q_NULLPTR;
|
audioHandler* txaudio = Q_NULLPTR;
|
||||||
QThread* txAudioThread = Q_NULLPTR;
|
QThread* txAudioThread = Q_NULLPTR;
|
||||||
|
|
||||||
QTimer* txAudioTimer = Q_NULLPTR;
|
QTimer* txAudioTimer = Q_NULLPTR;
|
||||||
|
|
|
@ -395,13 +395,13 @@ void udpServer::controlReceived()
|
||||||
connect(radio->txAudioThread, SIGNAL(finished()), radio->txaudio, SLOT(deleteLater()));
|
connect(radio->txAudioThread, SIGNAL(finished()), radio->txaudio, SLOT(deleteLater()));
|
||||||
|
|
||||||
// Not sure how we make this work in QT5.9?
|
// Not sure how we make this work in QT5.9?
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(7,10,0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(5,10,0))
|
||||||
QMetaObject::invokeMethod((audioHandler*)radio->txaudio, [=]() {
|
QMetaObject::invokeMethod(radio->txaudio, [=]() {
|
||||||
radio->txaudio->init(radio->txAudioSetup);
|
radio->txaudio->init(radio->txAudioSetup);
|
||||||
}, Qt::QueuedConnection);
|
}, Qt::QueuedConnection);
|
||||||
#else
|
#else
|
||||||
emit setupTxAudio(radio->txAudioSetup);
|
emit setupTxAudio(radio->txAudioSetup);
|
||||||
//#warning "QT 5.9 is not fully supported multiple rigs will NOT work!"
|
#warning "QT 5.9 is not fully supported multiple rigs will NOT work!"
|
||||||
#endif
|
#endif
|
||||||
hasTxAudio = datagram.senderAddress();
|
hasTxAudio = datagram.senderAddress();
|
||||||
|
|
||||||
|
@ -442,7 +442,7 @@ void udpServer::controlReceived()
|
||||||
connect(radio->rxAudioThread, SIGNAL(finished()), radio->rxaudio, SLOT(deleteLater()));
|
connect(radio->rxAudioThread, SIGNAL(finished()), radio->rxaudio, SLOT(deleteLater()));
|
||||||
connect(radio->rxaudio, SIGNAL(haveAudioData(audioPacket)), this, SLOT(receiveAudioData(audioPacket)));
|
connect(radio->rxaudio, SIGNAL(haveAudioData(audioPacket)), this, SLOT(receiveAudioData(audioPacket)));
|
||||||
|
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(7,10,0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(5,10,0))
|
||||||
QMetaObject::invokeMethod(radio->rxaudio, [=]() {
|
QMetaObject::invokeMethod(radio->rxaudio, [=]() {
|
||||||
radio->rxaudio->init(radio->rxAudioSetup);
|
radio->rxaudio->init(radio->rxAudioSetup);
|
||||||
}, Qt::QueuedConnection);
|
}, Qt::QueuedConnection);
|
||||||
|
|
|
@ -70,9 +70,9 @@ struct RIGCONFIG {
|
||||||
rigCapabilities rigCaps;
|
rigCapabilities rigCaps;
|
||||||
rigCommander* rig = Q_NULLPTR;
|
rigCommander* rig = Q_NULLPTR;
|
||||||
QThread* rigThread = Q_NULLPTR;
|
QThread* rigThread = Q_NULLPTR;
|
||||||
QObject* rxaudio = Q_NULLPTR;
|
audioHandler* rxaudio = Q_NULLPTR;
|
||||||
QThread* rxAudioThread = Q_NULLPTR;
|
QThread* rxAudioThread = Q_NULLPTR;
|
||||||
QObject* txaudio = Q_NULLPTR;
|
audioHandler* txaudio = Q_NULLPTR;
|
||||||
QThread* txAudioThread = Q_NULLPTR;
|
QThread* txAudioThread = Q_NULLPTR;
|
||||||
QTimer* rxAudioTimer = Q_NULLPTR;
|
QTimer* rxAudioTimer = Q_NULLPTR;
|
||||||
QTimer* connectTimer = Q_NULLPTR;
|
QTimer* connectTimer = Q_NULLPTR;
|
||||||
|
|
Ładowanie…
Reference in New Issue