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

Merge pull request #2713 from antis81:newav_audio_cleanup

Browse Source
This commit is contained in:
Nils Fenner 2015-12-20 23:10:03 +01:00
parent e73fd27d8b
commit 19201dda8a
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/audio/audio.cpp
View File

@ -181,8 +181,8 @@ public:
cleanupOutput(); cleanupOutput();
} }
bool initInput(const QString& inDevDescr); bool initInput(QString inDevDescr);
bool initOutput(const QString& outDevDescr); bool initOutput(QString outDevDescr);
void cleanupInput(); void cleanupInput();
void cleanupOutput(); void cleanupOutput();
@ -406,7 +406,7 @@ void Audio::unsubscribeInput()
d->cleanupInput(); d->cleanupInput();
} }
bool AudioPrivate::initInput(const QString& inDevDescr) bool AudioPrivate::initInput(QString inDevDescr)
{ {
qDebug() << "Opening audio input" << inDevDescr; qDebug() << "Opening audio input" << inDevDescr;
@ -430,11 +430,11 @@ bool AudioPrivate::initInput(const QString& inDevDescr)
alInDev = alcCaptureOpenDevice(pDeviceList, sampleRate, stereoFlag, bufSize); alInDev = alcCaptureOpenDevice(pDeviceList, sampleRate, stereoFlag, bufSize);
int len = strlen(pDeviceList); int len = strlen(pDeviceList);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString inDev = QString::fromUtf8(pDeviceList, len); inDevDescr = QString::fromUtf8(pDeviceList, len);
#else #else
QString inDev = QString::fromLocal8Bit(pDeviceList, len); inDevDescr = QString::fromLocal8Bit(pDeviceList, len);
#endif #endif
Settings::getInstance().setInDev(inDev); Settings::getInstance().setInDev(inDevDescr);
} }
else else
{ {
@ -445,13 +445,9 @@ bool AudioPrivate::initInput(const QString& inDevDescr)
alInDev = alcCaptureOpenDevice(inDevDescr.toStdString().c_str(), alInDev = alcCaptureOpenDevice(inDevDescr.toStdString().c_str(),
sampleRate, stereoFlag, bufSize); sampleRate, stereoFlag, bufSize);
if (alInDev)
qDebug() << "Opened audio input" << inDevDescr;
else
qWarning() << "Cannot open input audio device" << inDevDescr;
// Restart the capture if necessary // Restart the capture if necessary
if (alInDev) { if (alInDev) {
qDebug() << "Opened audio input" << inDevDescr;
alcCaptureStart(alInDev); alcCaptureStart(alInDev);
} else { } else {
qCritical() << "Failed to initialize audio input device:" << inDevDescr; qCritical() << "Failed to initialize audio input device:" << inDevDescr;
@ -467,7 +463,7 @@ bool AudioPrivate::initInput(const QString& inDevDescr)
Open an audio output device Open an audio output device
*/ */
bool AudioPrivate::initOutput(const QString& outDevDescr) bool AudioPrivate::initOutput(QString outDevDescr)
{ {
qDebug() << "Opening audio output" << outDevDescr; qDebug() << "Opening audio output" << outDevDescr;
outSources.clear(); outSources.clear();
@ -491,11 +487,11 @@ bool AudioPrivate::initOutput(const QString& outDevDescr)
alOutDev = alcOpenDevice(pDeviceList); alOutDev = alcOpenDevice(pDeviceList);
int len = strlen(pDeviceList); int len = strlen(pDeviceList);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString outDev = QString::fromUtf8(pDeviceList, len); outDevDescr = QString::fromUtf8(pDeviceList, len);
#else #else
QString outDev = QString::fromLocal8Bit(pDeviceList, len); outDevDescr = QString::fromLocal8Bit(pDeviceList, len);
#endif #endif
Settings::getInstance().setOutDev(outDev); Settings::getInstance().setOutDev(outDevDescr);
} }
else else
{ {
@ -747,7 +743,7 @@ void Audio::subscribeOutput(SID& sid)
if (!d->alOutDev) { if (!d->alOutDev) {
if (!d->initOutput(Settings::getInstance().getOutDev())) { if (!d->initOutput(Settings::getInstance().getOutDev())) {
qWarning("Failed to subscribe to audio input device."); qWarning("Failed to subscribe to audio output device.");
return; return;
} }
} }