#8125 Fix growing voice chat lag and double instance of voice chat co…

…ntrol
hasankhan · Dec 16, 2013 · 74cd281 · 74cd281
1 parent e99640a
commit 74cd281
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/Shared/AssemblyInfo.Version.cs b/Shared/AssemblyInfo.Version.cs
@@ -2,4 +2,4 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("3.3.2.0")]
+[assembly: AssemblyVersion("3.3.3.0")]
diff --git a/Squiggle.UI/Properties/AssemblyInfo.cs b/Squiggle.UI/Properties/AssemblyInfo.cs
@@ -42,4 +42,3 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("3.3.2.0")]
diff --git a/Squiggle.UI/Windows/ChatWindow.xaml.cs b/Squiggle.UI/Windows/ChatWindow.xaml.cs
@@ -623,9 +623,6 @@ public IVoiceChatHandler StartVoiceChat()
 
             var voiceChat = (IVoiceChatHandler)StartActivity(SquiggleActivities.VoiceChat, null);
 
-            if (voiceChat != null)
-                chatTextBox.AddVoiceChatSentRequest(context, voiceChat, PrimaryBuddy.DisplayName);
-
             return voiceChat;
         }        
 

diff --git a/Squiggle.VoiceChat/EchoFilterWaveProvider.cs b/Squiggle.VoiceChat/EchoFilterWaveProvider.cs
@@ -55,20 +55,32 @@ public int Read(byte[] buffer, int offset, int count)
         {
             lock (syncRoot)
             {
-                while (remoteSound.BufferedBytes >= bytesPerFrame && localSound.BufferedBytes >= bytesPerFrame)
-                {
-                    // read source of echo
-                    remoteSound.Read(remoteFrame, 0, bytesPerFrame);
-                    // read local sound + echo
-                    localSound.Read(localFrame, 0, bytesPerFrame);
-
-                    filter.Filter(localFrame, remoteFrame, outputFrame);
-                    filtered.AddSamples(outputFrame, 0, outputFrame.Length);
-                }
+                FilterEcho();
                 return filtered.Read(buffer, offset, count);
             }
         }
 
+        void FilterEcho()
+        {
+            while (remoteSound.BufferedBytes >= bytesPerFrame && localSound.BufferedBytes >= bytesPerFrame)
+            {
+                // read source of echo
+                remoteSound.Read(remoteFrame, 0, bytesPerFrame);
+                // read local sound + echo
+                localSound.Read(localFrame, 0, bytesPerFrame);
+
+                filter.Filter(localFrame, remoteFrame, outputFrame);
+                filtered.AddSamples(outputFrame, 0, outputFrame.Length);
+            }
+
+            // read the remaining remote sound and play it
+            while (remoteSound.BufferedBytes > 0)
+            {
+                remoteSound.Read(remoteFrame, 0, bytesPerFrame);
+                filtered.AddSamples(remoteFrame, 0, remoteFrame.Length);
+            }
+        }
+
         public void Dispose()
         {
             filter.Dispose();