Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix(audio): move audio timers to and start from audioThread
Browse files Browse the repository at this point in the history
Fix #5053
  • Loading branch information
anthonybilinski committed Apr 11, 2018
1 parent 97bc4a9 commit 5d0f950
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/audio/backend/openal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,28 @@ OpenAL::OpenAL()
alcGetError(nullptr);

audioThread->setObjectName("qTox Audio");
QObject::connect(audioThread, &QThread::finished, &voiceTimer, &QTimer::stop);
QObject::connect(audioThread, &QThread::finished, &captureTimer, &QTimer::stop);
QObject::connect(audioThread, &QThread::finished, &playMono16Timer, &QTimer::stop);
QObject::connect(audioThread, &QThread::finished, audioThread, &QThread::deleteLater);

moveToThread(audioThread);

voiceTimer.setSingleShot(true);
voiceTimer.moveToThread(audioThread);
connect(this, &Audio::startActive, &voiceTimer, static_cast<void (QTimer::*)(int)>(&QTimer::start));
connect(&voiceTimer, &QTimer::timeout, this, &Audio::stopActive);

connect(&captureTimer, &QTimer::timeout, this, &OpenAL::doAudio);
captureTimer.setInterval(AUDIO_FRAME_DURATION / 2);
captureTimer.setSingleShot(false);
captureTimer.start();
captureTimer.moveToThread(audioThread);
// TODO for Qt 5.6+: use qOverload
connect(audioThread, &QThread::started, &captureTimer, static_cast<void (QTimer::*)(void)>(&QTimer::start));

connect(&playMono16Timer, &QTimer::timeout, this, &OpenAL::playMono16SoundCleanup);
playMono16Timer.setSingleShot(true);
playMono16Timer.moveToThread(audioThread);

audioThread->start();
}
Expand Down Expand Up @@ -413,7 +421,7 @@ void OpenAL::playMono16Sound(const QByteArray& data)
alSourcePlay(alMainSource);

int durationMs = data.size() * 1000 / 2 / 44100;
playMono16Timer.start(durationMs + 50);
QMetaObject::invokeMethod(&playMono16Timer, "start", Q_ARG(int, durationMs + 50));
}

void OpenAL::playAudioBuffer(uint sourceId, const int16_t* data, int samples, unsigned channels,
Expand Down

0 comments on commit 5d0f950

Please sign in to comment.