FIX(client): Debug

Hartmnt · Oct 15, 2024 · 5dd26f4 · 5dd26f4
1 parent cb01bfa
commit 5dd26f4
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp
@@ -20,6 +20,8 @@
 
 #include <cmath>
 
+#include <QDebug>
+
 AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
 	bInit                        = true;
 	bLastActive                  = false;
@@ -47,12 +49,23 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
 	if (AudioInputRegistrar::qmNew) {
 		foreach (AudioInputRegistrar *air, *AudioInputRegistrar::qmNew) {
 			qcbInput->addItem(air->name);
+			qDebug() << air->name;
 			if (air->name == AudioInputRegistrar::current) {
+				qDebug() << "is current";
 				qcbInput->setCurrentIndex(qcbInput->count() - 1);
 				EchoCancelOptionID echoCancelOptionId = firstUsableEchoCancellation(air, qcbOutput->currentText());
-				if (echoCancelOptionId != EchoCancelOptionID::DISABLED) {
-					qcbEcho->setEnabled(true);
+				bool echoCancelPossible               = echoCancelOptionId != EchoCancelOptionID::DISABLED;
+				qcbEcho->setEnabled(echoCancelPossible);
+				if (echoCancelPossible) {
+					qDebug() << "echoCancelOptionId "
+							 << " is not disabled";
+					qDebug() << "echoOPtion"
+							 << " disabled?" << (Global::get().s.echoOption != EchoCancelOptionID::DISABLED);
 					qcbEcho->setChecked(Global::get().s.echoOption != EchoCancelOptionID::DISABLED);
+				} else {
+					qDebug() << "echoCancelOptionId "
+							 << " is disabled";
+					qcbEcho->setChecked(false);
 				}
 			}
 			QList< audioDevice > ql = air->getDeviceChoices();
@@ -244,6 +257,8 @@ void AudioWizard::on_qcbInputDevice_activated(int) {
 	}
 
 	EchoCancelOptionID echoCancelOptionId = firstUsableEchoCancellation(air, qcbOutput->currentText());
+	qDebug() << "inputDeviceActivated echoCancelOptionId "
+			 << " disabled?" << (echoCancelOptionId != EchoCancelOptionID::DISABLED);
 	qcbEcho->setEnabled(echoCancelOptionId != EchoCancelOptionID::DISABLED);
 
 	Global::get().ai = AudioInputPtr(air->create());
@@ -286,6 +301,8 @@ void AudioWizard::on_qcbOutputDevice_activated(int) {
 
 	AudioInputRegistrar *air              = AudioInputRegistrar::qmNew->value(qcbInput->currentText());
 	EchoCancelOptionID echoCancelOptionId = firstUsableEchoCancellation(air, qcbOutput->currentText());
+	qDebug() << "outputDeviceActivated echoCancelOptionId"
+			 << " disabled?" << (echoCancelOptionId != EchoCancelOptionID::DISABLED);
 	qcbEcho->setEnabled(echoCancelOptionId != EchoCancelOptionID::DISABLED);
 
 	Global::get().ao = AudioOutputPtr(aor->create());
@@ -684,6 +701,7 @@ void AudioWizard::on_qpbPTT_clicked() {
 }
 
 void AudioWizard::on_qcbEcho_clicked(bool on) {
+	qDebug() << "echoClicked on:" << on;
 	if (on) {
 		AudioInputRegistrar *air   = AudioInputRegistrar::qmNew->value(qcbInput->currentText());
 		Global::get().s.echoOption = firstUsableEchoCancellation(air, qcbOutput->currentText());
@@ -768,8 +786,15 @@ void AudioWizard::on_qrbQualityCustom_clicked() {
 }
 
 EchoCancelOptionID AudioWizard::firstUsableEchoCancellation(AudioInputRegistrar *air, const QString outputSys) {
+	const QString outputSystem;
+	if (!outputSys.isEmpty()) {
+		outputSystem = outputSys
+	} else {
+		outputSystem = Global::get().s.qsAudioOutput;
+	}
+	qDebug() << "First usable for " << air->name << " os " << outputSystem;
 	for (EchoCancelOptionID ecoid : air->echoOptions) {
-		if (air->canEcho(ecoid, outputSys)) {
+		if (air->canEcho(ecoid, outputSystem)) {
 			return ecoid;
 		}
 	}