From a8e895e654036cf47ddf061bc571e52e774a2a27 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Sat, 27 Mar 2021 16:07:17 +0000
Subject: [PATCH] Allow user to configure client name

---
 udphandler.cpp | 5 +----
 udphandler.h   | 1 +
 wfmain.cpp     | 4 ++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/udphandler.cpp b/udphandler.cpp
index 8d28536..de7628e 100644
--- a/udphandler.cpp
+++ b/udphandler.cpp
@@ -22,6 +22,7 @@ udpHandler::udpHandler(udpPreferences prefs) :
     this->port = this->controlPort;
     this->username = prefs.username;
     this->password = prefs.password;
+    this->compName = prefs.clientName.mid(0,8) + "-wfview";
 
     qDebug(logUdp()) << "Starting udpHandler user:" << username << " rx latency:" << rxLatency  << " tx latency:" << txLatency << " rx sample rate: " << rxSampleRate <<
         " rx codec: " << rxCodec << " tx sample rate: " << txSampleRate << " tx codec: " << txCodec;
@@ -56,10 +57,6 @@ udpHandler::udpHandler(udpPreferences prefs) :
         }
     }
 
-
-    // Set my computer name. Should this be configurable?
-    compName = "wfview";
-
 }
 
 void udpHandler::init()
diff --git a/udphandler.h b/udphandler.h
index 8310881..dc4bc48 100644
--- a/udphandler.h
+++ b/udphandler.h
@@ -49,6 +49,7 @@ struct udpPreferences {
 	quint16 audioTXSampleRate;
 	quint8 audioTXCodec;
 	quint8 resampleQuality;
+	QString clientName;
 };
 
 void passcode(QString in, QByteArray& out);
diff --git a/wfmain.cpp b/wfmain.cpp
index c767191..765a695 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -787,6 +787,7 @@ void wfmain::setDefPrefs()
     udpDefPrefs.audioTXSampleRate = 48000;
     udpDefPrefs.audioTXCodec = 4;
     udpDefPrefs.resampleQuality = 4;
+    udpDefPrefs.clientName = QHostInfo::localHostName();
 }
 
 void wfmain::loadSettings()
@@ -844,6 +845,7 @@ void wfmain::loadSettings()
     ui->passwordTxt->setEnabled(ui->lanEnableBtn->isChecked());
     ui->passwordTxt->setText(QString("%1").arg(udpPrefs.password));
 
+
     udpPrefs.audioRXLatency = settings.value("AudioRXLatency", udpDefPrefs.audioRXLatency).toInt();
     ui->rxLatencySlider->setEnabled(ui->lanEnableBtn->isChecked());
     ui->rxLatencySlider->setValue(udpPrefs.audioRXLatency);
@@ -903,6 +905,7 @@ void wfmain::loadSettings()
     }
 
     udpPrefs.resampleQuality = settings.value("ResampleQuality", udpDefPrefs.resampleQuality).toInt();
+    udpPrefs.clientName = settings.value("ClientName", udpDefPrefs.clientName).toString();
 
     settings.endGroup();
 
@@ -1012,6 +1015,7 @@ void wfmain::saveSettings()
     settings.setValue("AudioOutput", udpPrefs.audioOutput);
     settings.setValue("AudioInput", udpPrefs.audioInput);
     settings.setValue("ResampleQuality", udpPrefs.resampleQuality);
+    settings.setValue("clientName", udpPrefs.clientName);
     settings.endGroup();
 
     // Memory channels