diff --git a/plugins/VOIP/gui/AudioWizard.ui b/plugins/VOIP/gui/AudioWizard.ui index dfe9578f6..22d848fc4 100644 --- a/plugins/VOIP/gui/AudioWizard.ui +++ b/plugins/VOIP/gui/AudioWizard.ui @@ -202,7 +202,16 @@ - + + 0 + + + 0 + + + 0 + + 0 diff --git a/plugins/VOIP/gui/VOIPConfigPanel.cpp b/plugins/VOIP/gui/VOIPConfigPanel.cpp index b5ae020d0..3fbd9e895 100644 --- a/plugins/VOIP/gui/VOIPConfigPanel.cpp +++ b/plugins/VOIP/gui/VOIPConfigPanel.cpp @@ -19,7 +19,6 @@ * along with this program. If not, see . * * * *******************************************************************************/ -#pragma once #include "AudioStats.h" #include "VOIPConfigPanel.h" @@ -92,19 +91,15 @@ VOIPConfigPanel::VOIPConfigPanel(QWidget * parent, Qt::WindowFlags flags) inputAudioProcessor = NULL; inputAudioDevice = NULL; - abSpeech = NULL; qtTick = NULL; ui.qcbTransmit->addItem(tr("Continuous"), RsVOIP::AudioTransmitContinous); ui.qcbTransmit->addItem(tr("Voice Activity"), RsVOIP::AudioTransmitVAD); ui.qcbTransmit->addItem(tr("Push To Talk"), RsVOIP::AudioTransmitPushToTalk); - abSpeech = new AudioBar(); - abSpeech->qcBelow = Qt::red; - abSpeech->qcInside = Qt::yellow; - abSpeech->qcAbove = Qt::green; - //abSpeech->setGeometry(9,20,50,10); - ui.qwVadLayout_2->addWidget(abSpeech,0,0,1,0); + ui.abSpeech->qcBelow = Qt::red; + ui.abSpeech->qcInside = Qt::yellow; + ui.abSpeech->qcAbove = Qt::green; connect( ui.qsTransmitHold, SIGNAL( valueChanged ( int ) ), this, SLOT( on_qsTransmitHold_valueChanged(int) ) ); connect( ui.qsNoise, SIGNAL( valueChanged ( int ) ), this, SLOT( on_qsNoise_valueChanged(int) ) ); @@ -332,16 +327,16 @@ void VOIPConfigPanel::on_Tick_timeout() { // update the sound capture bar - abSpeech->iBelow = ui.qsTransmitMin->value(); - abSpeech->iAbove = ui.qsTransmitMax->value(); + ui.abSpeech->iBelow = ui.qsTransmitMin->value(); + ui.abSpeech->iAbove = ui.qsTransmitMax->value(); if (loaded) { rsVOIP->setVoipfVADmin(ui.qsTransmitMin->value()); rsVOIP->setVoipfVADmax(ui.qsTransmitMax->value()); } - abSpeech->iValue = iroundf(inputAudioProcessor->dVoiceAcivityLevel * 32767.0f + 0.5f); - abSpeech->update(); + ui.abSpeech->iValue = iroundf(inputAudioProcessor->dVoiceAcivityLevel * 32767.0f + 0.5f); + ui.abSpeech->update(); // also transmit encoded video diff --git a/plugins/VOIP/gui/VOIPConfigPanel.h b/plugins/VOIP/gui/VOIPConfigPanel.h index 0df5d882f..4985cb5b7 100644 --- a/plugins/VOIP/gui/VOIPConfigPanel.h +++ b/plugins/VOIP/gui/VOIPConfigPanel.h @@ -19,7 +19,6 @@ * * *******************************************************************************/ #pragma once -#pragma once #include #include @@ -46,9 +45,9 @@ private: voipGraphSource *_src ; }; -#include "ui_AudioInputConfig.h" +#include "ui_VOIPConfigPanel.h" -class VOIPConfigPanel : public ConfigPage +class VOIPConfigPanel : public ConfigPage { Q_OBJECT diff --git a/plugins/VOIP/gui/VOIPConfigPanel.ui b/plugins/VOIP/gui/VOIPConfigPanel.ui index ab1849358..3687dbb89 100644 --- a/plugins/VOIP/gui/VOIPConfigPanel.ui +++ b/plugins/VOIP/gui/VOIPConfigPanel.ui @@ -53,7 +53,7 @@ - 2 + 1 @@ -242,13 +242,39 @@ Audio - - + + + + + 30 + 0 + + - Noise Suppression + + + + + + + + Amplification - qsNoise + qsAmp + + + + + + + + 30 + 0 + + + + @@ -277,26 +303,23 @@ - - - - - 30 - 0 - - + + - + Echo Cancellation Processing + + + false - - + + - Amplification + Noise Suppression - qsAmp + qsNoise @@ -322,28 +345,8 @@ - - - - - 30 - 0 - - - - - - - - - - - Echo Cancellation Processing - - - false - - + + @@ -459,7 +462,13 @@ voipGraph QFrame -
gui/AudioInputConfig.h
+
gui/VOIPConfigPanel.h
+ 1 +
+ + AudioBar + QWidget +
gui/AudioStats.h
1