From 3a0d874bb5557b9815d05f7f071b0e9d7f894f80 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Mon, 9 Jan 2017 13:21:20 -0500
Subject: [PATCH] add injector ring buffer to audio client

---
 libraries/audio-client/src/AudioClient.cpp | 3 ++-
 libraries/audio-client/src/AudioClient.h   | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 1e97de8dca..8e73c1a983 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -127,6 +127,7 @@ AudioClient::AudioClient() :
     _loopbackAudioOutput(NULL),
     _loopbackOutputDevice(NULL),
     _inputRingBuffer(0),
+    _localInjectorsBuffer(0),
     _receivedAudioStream(RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES),
     _isStereoInput(false),
     _outputStarveDetectionStartTimeMsec(0),
@@ -146,7 +147,7 @@ AudioClient::AudioClient() :
     _networkToOutputResampler(NULL),
     _audioLimiter(AudioConstants::SAMPLE_RATE, OUTPUT_CHANNEL_COUNT),
     _outgoingAvatarAudioSequenceNumber(0),
-    _audioOutputIODevice(_receivedAudioStream, this),
+    _audioOutputIODevice(_localInjectorsBuffer, _receivedAudioStream, this),
     _stats(&_receivedAudioStream),
     _inputGate(),
     _positionGetter(DEFAULT_POSITION_GETTER),
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 0320b5db2b..0733bba47c 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -84,8 +84,10 @@ public:
 
     class AudioOutputIODevice : public QIODevice {
     public:
-        AudioOutputIODevice(MixedProcessedAudioStream& receivedAudioStream, AudioClient* audio) :
-            _receivedAudioStream(receivedAudioStream), _audio(audio), _unfulfilledReads(0) {};
+        AudioOutputIODevice(AudioRingBuffer& localInjectorsBuffer, MixedProcessedAudioStream& receivedAudioStream,
+                AudioClient* audio) :
+            _localInjectorsBuffer(localInjectorsBuffer), _receivedAudioStream(receivedAudioStream),
+            _audio(audio), _unfulfilledReads(0) {}
 
         void start() { open(QIODevice::ReadOnly | QIODevice::Unbuffered); }
         void stop() { close(); }
@@ -93,6 +95,7 @@ public:
         qint64 writeData(const char * data, qint64 maxSize) override { return 0; }
         int getRecentUnfulfilledReads() { int unfulfilledReads = _unfulfilledReads; _unfulfilledReads = 0; return unfulfilledReads; }
     private:
+        AudioRingBuffer& _localInjectorsBuffer;
         MixedProcessedAudioStream& _receivedAudioStream;
         AudioClient* _audio;
         int _unfulfilledReads;
@@ -262,6 +265,7 @@ private:
     QAudioOutput* _loopbackAudioOutput;
     QIODevice* _loopbackOutputDevice;
     AudioRingBuffer _inputRingBuffer;
+    AudioRingBuffer _localInjectorsBuffer;
     MixedProcessedAudioStream _receivedAudioStream;
     bool _isStereoInput;