Revert last commit

f1xpl · Mar 25, 2018 · f9692b7 · f9692b7
1 parent 18fa86b
commit f9692b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/include/f1x/openauto/autoapp/Projection/RtAudioOutput.hpp b/include/f1x/openauto/autoapp/Projection/RtAudioOutput.hpp
@@ -55,7 +55,6 @@ class RtAudioOutput: public IAudioOutput
     SequentialBuffer audioBuffer_;
     std::unique_ptr<RtAudio> dac_;
     std::mutex mutex_;
-    bool playbackRequested_;
 };
 
 }

diff --git a/src/autoapp/Projection/RtAudioOutput.cpp b/src/autoapp/Projection/RtAudioOutput.cpp
@@ -32,7 +32,6 @@ RtAudioOutput::RtAudioOutput(uint32_t channelCount, uint32_t sampleSize, uint32_
     : channelCount_(channelCount)
     , sampleSize_(sampleSize)
     , sampleRate_(sampleRate)
-    , playbackRequested_(false)
 {
     std::vector<RtAudio::Api> apis;
     RtAudio::getCompiledApi(apis);
@@ -55,7 +54,7 @@ bool RtAudioOutput::open()
             RtAudio::StreamOptions streamOptions;
             streamOptions.numberOfBuffers = 1;
             streamOptions.flags = RTAUDIO_MINIMIZE_LATENCY | RTAUDIO_SCHEDULE_REALTIME;
-            uint32_t bufferFrames = 256;
+            uint32_t bufferFrames = 64;
             dac_->openStream(&parameters, nullptr, RTAUDIO_SINT16, sampleRate_, &bufferFrames, &RtAudioOutput::audioBufferReadHandler, static_cast<void*>(this), &streamOptions);
             return audioBuffer_.open(QIODevice::ReadWrite);
         }
@@ -75,10 +74,13 @@ bool RtAudioOutput::open()
 void RtAudioOutput::write(const aasdk::common::DataConstBuffer& buffer)
 {
     audioBuffer_.write(reinterpret_cast<const char*>(buffer.cdata), buffer.size);
+}
 
+void RtAudioOutput::start()
+{
     std::lock_guard<decltype(mutex_)> lock(mutex_);
 
-    if(playbackRequested_ && dac_->isStreamOpen() && !dac_->isStreamRunning())
+    if(dac_->isStreamOpen() && !dac_->isStreamRunning())
     {
         try
         {
@@ -89,15 +91,6 @@ void RtAudioOutput::write(const aasdk::common::DataConstBuffer& buffer)
             OPENAUTO_LOG(error) << "[RtAudioOutput] Failed to start audio output, what: " << e.what();
         }
     }
-
-    playbackRequested_ = false;
-}
-
-void RtAudioOutput::start()
-{
-    std::lock_guard<decltype(mutex_)> lock(mutex_);
-
-    playbackRequested_ = true;
 }
 
 void RtAudioOutput::stop()