kopia lustrzana https://gitlab.com/eliggett/wfview
Add pa/rt to server
rodzic
e6ff2ae152
commit
2e433ed71f
|
@ -498,6 +498,7 @@ void servermain::loadSettings()
|
||||||
tempPrefs->rxAudioSetup.name = settings->value("AudioInput", "default").toString();
|
tempPrefs->rxAudioSetup.name = settings->value("AudioInput", "default").toString();
|
||||||
tempPrefs->txAudioSetup.name = settings->value("AudioOutput", "default").toString();
|
tempPrefs->txAudioSetup.name = settings->value("AudioOutput", "default").toString();
|
||||||
|
|
||||||
|
|
||||||
QString tempPort = "auto";
|
QString tempPort = "auto";
|
||||||
if (tempPrefs->rigName=="<NONE>")
|
if (tempPrefs->rigName=="<NONE>")
|
||||||
{
|
{
|
||||||
|
|
|
@ -367,7 +367,22 @@ void udpServer::controlReceived()
|
||||||
|
|
||||||
outAudio.isinput = false;
|
outAudio.isinput = false;
|
||||||
|
|
||||||
radio->txaudio = new audioHandler();
|
|
||||||
|
if (radio->txAudioSetup.type == qtAudio) {
|
||||||
|
radio->txaudio = new audioHandler();
|
||||||
|
}
|
||||||
|
else if (radio->txAudioSetup.type == portAudio) {
|
||||||
|
radio->txaudio = new paHandler();
|
||||||
|
}
|
||||||
|
else if (radio->txAudioSetup.type == rtAudio) {
|
||||||
|
radio->txaudio = new rtHandler();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qCritical(logAudio()) << "Unsupported Transmit Audio Handler selected!";
|
||||||
|
}
|
||||||
|
|
||||||
|
//radio->txaudio = new audioHandler();
|
||||||
radio->txAudioThread = new QThread(this);
|
radio->txAudioThread = new QThread(this);
|
||||||
radio->txAudioThread->setObjectName("txAudio()");
|
radio->txAudioThread->setObjectName("txAudio()");
|
||||||
|
|
||||||
|
@ -380,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(5,10,0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(7,10,0))
|
||||||
QMetaObject::invokeMethod(radio->txaudio, [=]() {
|
QMetaObject::invokeMethod((audioHandler*)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();
|
||||||
|
|
||||||
|
@ -395,21 +410,27 @@ void udpServer::controlReceived()
|
||||||
}
|
}
|
||||||
if ((!memcmp(radio->guid, current->guid, GUIDLEN) || config->rigs.size() == 1) && radio->rxaudio == Q_NULLPTR && !config->lan)
|
if ((!memcmp(radio->guid, current->guid, GUIDLEN) || config->rigs.size() == 1) && radio->rxaudio == Q_NULLPTR && !config->lan)
|
||||||
{
|
{
|
||||||
#if !defined(PORTAUDIO) && !defined(RTAUDIO)
|
|
||||||
qInfo(logUdpServer()) << "Radio" << radio->rigName << "audio input(RX) :" << radio->rxAudioSetup.port.deviceName();
|
|
||||||
qInfo(logUdpServer()) << "Radio" << radio->rigName << "audio output(TX) :" << radio->txAudioSetup.port.deviceName();
|
|
||||||
#else
|
|
||||||
qInfo(logUdpServer()) << "Server audio input (RX):" << inAudio.name;
|
|
||||||
qInfo(logUdpServer()) << "Server audio output (TX):" << outAudio.name;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
radio->rxAudioSetup.codec = current->rxCodec;
|
radio->rxAudioSetup.codec = current->rxCodec;
|
||||||
radio->rxAudioSetup.sampleRate=current->rxSampleRate;
|
radio->rxAudioSetup.sampleRate=current->rxSampleRate;
|
||||||
radio->rxAudioSetup.latency = current->txBufferLen;
|
radio->rxAudioSetup.latency = current->txBufferLen;
|
||||||
radio->rxAudioSetup.isinput = true;
|
radio->rxAudioSetup.isinput = true;
|
||||||
memcpy(radio->rxAudioSetup.guid, radio->guid, GUIDLEN);
|
memcpy(radio->rxAudioSetup.guid, radio->guid, GUIDLEN);
|
||||||
|
|
||||||
radio->rxaudio = new audioHandler();
|
//radio->rxaudio = new audioHandler();
|
||||||
|
if (radio->rxAudioSetup.type == qtAudio) {
|
||||||
|
radio->rxaudio = new audioHandler();
|
||||||
|
}
|
||||||
|
else if (radio->rxAudioSetup.type == portAudio) {
|
||||||
|
radio->rxaudio = new paHandler();
|
||||||
|
}
|
||||||
|
else if (radio->rxAudioSetup.type == rtAudio) {
|
||||||
|
radio->rxaudio = new rtHandler();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qCritical(logAudio()) << "Unsupported Receive Audio Handler selected!";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
radio->rxAudioThread = new QThread(this);
|
radio->rxAudioThread = new QThread(this);
|
||||||
radio->rxAudioThread->setObjectName("rxAudio()");
|
radio->rxAudioThread->setObjectName("rxAudio()");
|
||||||
|
@ -421,12 +442,12 @@ 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(5,10,0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(7,10,0))
|
||||||
QMetaObject::invokeMethod(radio->rxaudio, [=]() {
|
QMetaObject::invokeMethod(radio->rxaudio, [=]() {
|
||||||
radio->rxaudio->init(radio->rxAudioSetup);
|
radio->rxaudio->init(radio->rxAudioSetup);
|
||||||
}, Qt::QueuedConnection);
|
}, Qt::QueuedConnection);
|
||||||
#else
|
#else
|
||||||
#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!"
|
||||||
connect(this, SIGNAL(setupRxAudio(audioSetup)), radio->rxaudio, SLOT(init(audioSetup)));
|
connect(this, SIGNAL(setupRxAudio(audioSetup)), radio->rxaudio, SLOT(init(audioSetup)));
|
||||||
setupRxAudio(radio->rxAudioSetup);
|
setupRxAudio(radio->rxAudioSetup);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -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;
|
||||||
audioHandler* rxaudio = Q_NULLPTR;
|
QObject* rxaudio = Q_NULLPTR;
|
||||||
QThread* rxAudioThread = Q_NULLPTR;
|
QThread* rxAudioThread = Q_NULLPTR;
|
||||||
audioHandler* txaudio = Q_NULLPTR;
|
QObject* 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