Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-05 07:35:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged existing p3VoRS service with VOIP plugin

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-02-19 15:07:47 +00:00
parent 08d57e1681
commit 2f38506763
14 changed files with 730 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/VOIP/gui/AudioWizard.cpp
View file

@ -35,7 +35,7 @@
//#include "Log.h"
//#include "MainWindow.h"
#include "audiodevicehelper.h"
#include "rsvoip.h"
#include "interface/rsvoip.h"
#define iroundf(x) ( static_cast<int>(x) )
@ -70,9 +70,9 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
verticalLayout_3->addWidget(abAmplify);
if (rsVoipSI->getVoipATransmit() == RsVoipServiceInterface::AudioTransmitPushToTalk)
if (rsVoip->getVoipATransmit() == RsVoip::AudioTransmitPushToTalk)
qrPTT->setChecked(true);
else if (rsVoipSI->getVoipATransmit() == RsVoipServiceInterface::AudioTransmitVAD)
else if (rsVoip->getVoipATransmit() == RsVoip::AudioTransmitVAD)
qrVAD->setChecked(true);
else
qrContinuous->setChecked(true);
@ -82,13 +82,13 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
abVAD->qcInside = Qt::yellow;
abVAD->qcAbove = Qt::green;
qsTransmitMin->setValue(rsVoipSI->getVoipfVADmin());
qsTransmitMax->setValue(rsVoipSI->getVoipfVADmax());
qsTransmitMin->setValue(rsVoip->getVoipfVADmin());
qsTransmitMax->setValue(rsVoip->getVoipfVADmax());
verticalLayout_6->addWidget(abVAD);
// Volume
qsMaxAmp->setValue(rsVoipSI->getVoipiMinLoudness());
qsMaxAmp->setValue(rsVoip->getVoipiMinLoudness());
setOption(QWizard::NoCancelButton, false);
resize(700, 500);
@ -130,7 +130,7 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
void AudioWizard::on_qsMaxAmp_valueChanged(int v) {
rsVoipSI->setVoipiMinLoudness(qMin(v, 30000));
rsVoip->setVoipiMinLoudness(qMin(v, 30000));
}
void AudioWizard::on_Ticker_timeout() {
@ -158,8 +158,8 @@ void AudioWizard::on_Ticker_timeout() {
abVAD->iBelow = qsTransmitMin->value();
abVAD->iAbove = qsTransmitMax->value();
rsVoipSI->setVoipfVADmin(qsTransmitMin->value());
rsVoipSI->setVoipfVADmax(qsTransmitMax->value());
rsVoip->setVoipfVADmin(qsTransmitMin->value());
rsVoip->setVoipfVADmax(qsTransmitMax->value());
abVAD->iValue = iroundf(inputProcessor->dVoiceAcivityLevel * 32767.0f + 0.5f);
@ -214,19 +214,19 @@ void AudioWizard::on_playEcho_timeout() {
void AudioWizard::on_qsTransmitMax_valueChanged(int v) {
if (! bInit) {
rsVoipSI->setVoipfVADmax(v);
rsVoip->setVoipfVADmax(v);
}
}
void AudioWizard::on_qsTransmitMin_valueChanged(int v) {
if (! bInit) {
rsVoipSI->setVoipfVADmin(v);
rsVoip->setVoipfVADmin(v);
}
}
void AudioWizard::on_qrVAD_clicked(bool on) {
if (on) {
rsVoipSI->setVoipATransmit(RsVoipServiceInterface::AudioTransmitVAD);
rsVoip->setVoipATransmit(RsVoip::AudioTransmitVAD);
updateTriggerWidgets(true);
bTransmitChanged = true;
}
@ -234,7 +234,7 @@ void AudioWizard::on_qrVAD_clicked(bool on) {
void AudioWizard::on_qrPTT_clicked(bool on) {
if (on) {
rsVoipSI->setVoipATransmit(RsVoipServiceInterface::AudioTransmitPushToTalk);
rsVoip->setVoipATransmit(RsVoip::AudioTransmitPushToTalk);
updateTriggerWidgets(false);
bTransmitChanged = true;
}
@ -242,7 +242,7 @@ void AudioWizard::on_qrPTT_clicked(bool on) {
void AudioWizard::on_qrContinuous_clicked(bool on) {
if (on) {
rsVoipSI->setVoipATransmit(RsVoipServiceInterface::AudioTransmitContinous);
rsVoip->setVoipATransmit(RsVoip::AudioTransmitContinous);
updateTriggerWidgets(false);
bTransmitChanged = true;
}