From 53226e7924d109be6a1a763da0793d721bbe32be Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 12 Oct 2018 11:19:52 -0700
Subject: [PATCH] Prevent overflows; still not working

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

diff --git a/interface/src/scripting/TTSScriptingInterface.h b/interface/src/scripting/TTSScriptingInterface.h
index cb9c6c8c3e..c1fffe67d1 100644
--- a/interface/src/scripting/TTSScriptingInterface.h
+++ b/interface/src/scripting/TTSScriptingInterface.h
@@ -77,7 +77,7 @@ private:
     CComPtr<ISpObjectToken> m_voiceToken;
 
     QByteArray _lastSoundByteArray;
-    AudioInjectorPointer _lastSoundByteArray;
+    AudioInjectorPointer _lastSoundAudioInjector;
 };
 
 #endif // hifi_SpeechScriptingInterface_h
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 96f1c97878..12da7ea3be 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1167,7 +1167,7 @@ void AudioClient::processAudioAndAddToRingBuffer(QByteArray& inputByteArray, con
                                numNetworkSamples, channelCount, _desiredInputFormat.channelCount());
         }
         int bytesInInputRingBuffer = _inputRingBuffer.samplesAvailable() * AudioConstants::SAMPLE_SIZE;
-        float msecsInInputRingBuffer = bytesInInputRingBuffer / (float)(_inputFormat.bytesForDuration(USECS_PER_MSEC));
+        float msecsInInputRingBuffer = bytesInInputRingBuffer / (float)(bytesForDuration);
         _stats.updateInputMsUnplayed(msecsInInputRingBuffer);
 
         QByteArray audioBuffer(reinterpret_cast<char*>(networkAudioSamples), numNetworkBytes);
@@ -1204,7 +1204,12 @@ void AudioClient::handleRecordedAudioInput(const QByteArray& audio) {
 
 void AudioClient::handleTTSAudioInput(const QByteArray& audio) {
     QByteArray audioBuffer(audio);
-    processAudioAndAddToRingBuffer(audioBuffer, 1, 48);
+    while (audioBuffer.size() > 0) {
+        QByteArray part;
+        part.append(audioBuffer.data(), AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
+        audioBuffer.remove(0, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
+        processAudioAndAddToRingBuffer(part, 1,  48);
+    }
 }
 
 void AudioClient::prepareLocalAudioInjectors(std::unique_ptr<Lock> localAudioLock) {