StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Audio: Only open mic when requested

Browse Source
This commit is contained in:
TheSpiritXIII 2015-08-05 11:42:10 -04:00 committed by Nils Fenner
parent 868381fe3f
commit bbbd450b6a
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/audio/audio.cpp
View File

@ -113,11 +113,11 @@ void Audio::setInputVolume(float volume)
void Audio::suscribeInput()
{
if (!alInDev)
/*if (!alInDev)
{
qWarning()<<"input device is closed";
return;
}
}*/
qDebug() << "suscribing input";
QMutexLocker lock(audioInLock);
@ -125,6 +125,7 @@ void Audio::suscribeInput()
{
timer->stop();
openOutput(Settings::getInstance().getOutDev());
openInput(Settings::getInstance().getInDev());
#if (!FIX_SND_PCM_PREPARE_BUG)
if (alInDev)
@ -144,7 +145,9 @@ void Audio::unsuscribeInput()
return;
}
qDebug() << "unsuscribing input";
assert(userCount > 0);
qDebug() << "unsuscribing input" << userCount;
QMutexLocker lock(audioInLock);
if (!--userCount)
{
@ -156,6 +159,7 @@ void Audio::unsuscribeInput()
alcCaptureStop(alInDev);
}
#endif
closeInput();
}
}
@ -186,7 +190,7 @@ void Audio::openInput(const QString& inDevDescr)
core->resetCallSources(); // Force to regen each group call's sources
// Restart the capture if necessary
if (userCount.load() != 0 && alInDev)
if (/*userCount.load() != 0 && */alInDev)
{
alcCaptureStart(alInDev);
}

4
src/core/core.cpp
View File

@ -84,8 +84,8 @@ Core::Core(QThread *CoreThread, Profile& profile) :
// OpenAL init
//QString outDevDescr = Settings::getInstance().getOutDev();
//Audio::openOutput(outDevDescr);
QString inDevDescr = Settings::getInstance().getInDev();
Audio::openInput(inDevDescr);
//QString inDevDescr = Settings::getInstance().getInDev();
//Audio::openInput(inDevDescr);
}
void Core::deadifyTox()

13
src/widget/tool/micfeedbackwidget.cpp
View File

@ -22,7 +22,9 @@
#include <QPainter>
#include <QLinearGradient>
MicFeedbackWidget::MicFeedbackWidget(QWidget *parent) : QWidget(parent)
MicFeedbackWidget::MicFeedbackWidget(QWidget *parent)
: QWidget(parent)
, timerId(0)
{
setFixedHeight(20);
}
@ -83,11 +85,16 @@ void MicFeedbackWidget::timerEvent(QTimerEvent*)
void MicFeedbackWidget::showEvent(QShowEvent*)
{
Audio::suscribeInput();
int timerId = startTimer(60);
timerId = startTimer(60);
}
void MicFeedbackWidget::hideEvent(QHideEvent*)
{
Audio::unsuscribeInput();
killTimer(timerId);
if (timerId != 0)
{
killTimer(timerId);
timerId = 0;
}
}