#1 Multi Part responses from the assistant can lead to the data recei…

…ved not being the max number of bytes but have follow on audio. So remove the 1600 byte hack.
ac87 · May 10, 2017 · f6376f9 · f6376f9
1 parent 3544dde
commit f6376f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Assistant.cs b/Assistant.cs
@@ -182,11 +182,11 @@ private async Task WaitForResponse()
                 OnDebug?.Invoke(ResponseToOutput(currentResponse));
 
                 // EndOfUtterance, Assistant has recognised something so stop sending audio 
-                if (currentResponse.EventType == ConverseResponse.Types.EventType.EndOfUtterance)                
+                if (currentResponse.EventType == ConverseResponse.Types.EventType.EndOfUtterance)
                     ResetSendingAudio(false);
 
                 if (currentResponse.AudioOut != null)
-                    _audioOut.Play(currentResponse.AudioOut.AudioData.ToByteArray());
+                    _audioOut.AddBytesToPlay(currentResponse.AudioOut.AudioData.ToByteArray());
 
                 if (currentResponse.Result != null)
                 {
@@ -195,7 +195,7 @@ private async Task WaitForResponse()
                         _assistantResponseReceived = true;
 
                     switch (currentResponse.Result.MicrophoneMode)
-                    {                        
+                    {
                         // this is the end of the current conversation
                         case ConverseResult.Types.MicrophoneMode.CloseMicrophone:
                             StopRecording();
@@ -218,7 +218,11 @@ private async Task WaitForResponse()
                 await WaitForResponse();
             }
             else
+            {
                 OnDebug?.Invoke("Response End");
+                // if we've received any audio... play it.
+                _audioOut.Play();
+            }
         }
 
         private void ResetSendingAudio(bool send)

diff --git a/AudioOut.cs b/AudioOut.cs
@@ -17,9 +17,9 @@ public class AudioOut
         private WaveOut _waveOut;
 
         private MemoryStream _ms;
-        private RawSourceWaveStream _waveStream;
+        private RawSourceWaveStream _waveStream;       
 
-        public void Play(byte[] bytes)
+        public void AddBytesToPlay(byte[] bytes)
         {
             if (_waveOut == null)
             {
@@ -36,10 +36,12 @@ public void Play(byte[] bytes)
             if (_ms == null)
                 _ms = new MemoryStream();
 
-            _ms.Write(bytes, 0, bytes.Length);
+            _ms.Write(bytes, 0, bytes.Length);            
+        }
 
-            // cheat, I know at the bitrate requested it splits it in this size chunks, if its not this size its the end
-            if (bytes.Length != 1600) 
+        public void Play()
+        {
+            if (_ms != null && _ms.Length > 0)
             {
                 _ms.Position = 0;
                 _waveStream = new RawSourceWaveStream(_ms, WaveFormat);