From 1611058f7755f078fb76f96fac7dde0edffd85d2 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Tue, 4 Jan 2022 21:26:03 +0000
Subject: [PATCH] Maybe fix audio crash?

---
 audiohandler.cpp | 2 +-
 udpserver.cpp    | 5 +++++
 wfmain.cpp       | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/audiohandler.cpp b/audiohandler.cpp
index 61d9676..9a86577 100644
--- a/audiohandler.cpp
+++ b/audiohandler.cpp
@@ -63,7 +63,6 @@ bool audioHandler::init(audioSetup setupIn)
 	if (isInitialized) {
 		return false;
 	}
-	qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "audio handler starting:" << setup.name;
 
 	/*
 	0x01 uLaw 1ch 8bit
@@ -77,6 +76,7 @@ bool audioHandler::init(audioSetup setupIn)
 	setup = setupIn;
 	setup.radioChan = 1;
 	setup.bits = 8;
+	qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "audio handler starting:" << setup.name;
 
 	if (setup.codec == 0x01 || setup.codec == 0x20) {
 		setup.ulaw = true;
diff --git a/udpserver.cpp b/udpserver.cpp
index 7163fda..3cd2a42 100644
--- a/udpserver.cpp
+++ b/udpserver.cpp
@@ -8,6 +8,9 @@ udpServer::udpServer()
 
 void udpServer::init(SERVERCONFIG conf, audioSetup out, audioSetup in)
 {
+
+    qInfo(logUdpServer()) << "Input audio device:" << in.name;
+    qInfo(logUdpServer()) << "Output audio device:" << out.name;
     this->config = conf;
     this->outAudio = out;
     this->inAudio = in;
@@ -318,6 +321,7 @@ void udpServer::controlReceived()
                     outAudio.codec = current->txCodec;
                     outAudio.samplerate = current->txSampleRate;
                     outAudio.latency = current->txBufferLen;
+                    outAudio.isinput = false;
 
                     txaudio = new audioHandler();
                     txAudioThread = new QThread(this);
@@ -339,6 +343,7 @@ void udpServer::controlReceived()
                 {
                     inAudio.codec = current->rxCodec;
                     inAudio.samplerate = current->rxSampleRate;
+                    inAudio.isinput = true;
 
                     rxaudio = new audioHandler();
 
diff --git a/wfmain.cpp b/wfmain.cpp
index 1f874f5..2bda382 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -964,13 +964,15 @@ void wfmain::setServerToPrefs()
 
     if (serverConfig.enabled) {
         serverConfig.lan = prefs.enableLAN;
-
+        qInfo(logAudio()) << "Audio Input device " << serverRxSetup.name;
+        qInfo(logAudio()) << "Audio Output device " << serverTxSetup.name;
         udp = new udpServer();
 
         serverThread = new QThread(this);
 
         udp->moveToThread(serverThread);
 
+
         connect(this, SIGNAL(initServer(SERVERCONFIG, audioSetup, audioSetup)), udp, SLOT(init(SERVERCONFIG, audioSetup, audioSetup)));
         connect(serverThread, SIGNAL(finished()), udp, SLOT(deleteLater()));
 
@@ -983,6 +985,7 @@ void wfmain::setServerToPrefs()
         emit initServer(serverConfig, serverTxSetup, serverRxSetup);
 
         connect(this, SIGNAL(sendRigCaps(rigCapabilities)), udp, SLOT(receiveRigCaps(rigCapabilities)));
+
         ui->statusBar->showMessage(QString("Server enabled"), 1000);
 
     }