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

cleanup Audio::openOutput

Browse Source
This commit is contained in:
Nils Fenner 2015-10-20 23:14:07 +02:00
parent 3eb7b48d1c
commit 82e1644d67
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio/audio.cpp
View File

@ -231,7 +231,9 @@ Open an output device
*/ */
bool Audio::openOutput(const QString &outDevDescr) bool Audio::openOutput(const QString &outDevDescr)
{ {
qDebug() << "Opening audio output " + outDevDescr;
QMutexLocker lock(&audioOutLock); QMutexLocker lock(&audioOutLock);
auto* tmp = alOutDev; auto* tmp = alOutDev;
alOutDev = nullptr; alOutDev = nullptr;
if (outDevDescr.isEmpty()) if (outDevDescr.isEmpty())
@ -239,12 +241,7 @@ bool Audio::openOutput(const QString &outDevDescr)
else else
alOutDev = alcOpenDevice(outDevDescr.toStdString().c_str()); alOutDev = alcOpenDevice(outDevDescr.toStdString().c_str());
if (!alOutDev) if (alOutDev)
{
qWarning() << "Cannot open output audio device " + outDevDescr;
return false;
}
else
{ {
if (alContext && alcMakeContextCurrent(nullptr) == ALC_TRUE) if (alContext && alcMakeContextCurrent(nullptr) == ALC_TRUE)
alcDestroyContext(alContext); alcDestroyContext(alContext);
@ -252,19 +249,22 @@ bool Audio::openOutput(const QString &outDevDescr)
if (tmp) if (tmp)
alcCloseDevice(tmp); alcCloseDevice(tmp);
alContext = alcCreateContext(alOutDev,nullptr); alContext = alcCreateContext(alOutDev, nullptr);
if (!alcMakeContextCurrent(alContext)) if (alcMakeContextCurrent(alContext))
{
alGenSources(1, &alMainSource);
}
else
{ {
qWarning() << "Cannot create output audio context"; qWarning() << "Cannot create output audio context";
alcCloseDevice(alOutDev); alcCloseDevice(alOutDev);
return false; return false;
} }
else }
{ else
alGenSources(1, &alMainSource); {
} qWarning() << "Cannot open output audio device " + outDevDescr;
return false;
qDebug() << "Opening audio output " + outDevDescr;
} }
Core* core = Core::getInstance(); Core* core = Core::getInstance();
@ -405,7 +405,7 @@ void Audio::playGroupAudio(int group, int peer, const int16_t* data,
qreal volume = 0.; qreal volume = 0.;
int bufsize = samples * 2 * channels; int bufsize = samples * 2 * channels;
for (int i = 0; i < bufsize; ++i) for (int i = 0; i < bufsize; ++i)
volume += abs(data[i]);//std::max(volume, data[i]); volume += abs(data[i]);
emit groupAudioPlayed(group, peer, volume / bufsize); emit groupAudioPlayed(group, peer, volume / bufsize);