haraldwolff
/
openauto
mirror of https://github.com/f1xpl/openauto.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix race condition in AudioInput

pull/10/head
michal.szwaj 2018-02-17 21:55:57 +01:00
parent 88cc45ac2e
commit 54f160c8c8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/autoapp/Projection/AudioInput.cpp
View File

@ -97,24 +97,23 @@ void AudioInput::stop()
uint32_t AudioInput::getSampleSize() const
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return audioFormat_.sampleSize();
}
uint32_t AudioInput::getChannelCount() const
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return audioFormat_.channelCount();
}
uint32_t AudioInput::getSampleRate() const
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return audioFormat_.sampleRate();
}
void AudioInput::onStartRecording(StartPromise::Pointer promise)
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
ioDevice_ = audioInput_->start();
if(ioDevice_ != nullptr)
@ -130,6 +129,8 @@ void AudioInput::onStartRecording(StartPromise::Pointer promise)
void AudioInput::onStopRecording()
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
if(readPromise_ != nullptr)
{
readPromise_->reject();
@ -148,6 +149,8 @@ void AudioInput::onStopRecording()
void AudioInput::onReadyRead()
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
if(readPromise_ == nullptr)
{
return;