Merge pull request #47 from Meetsch/master

Feature: Channel Administration & speaking in multiple channels + minor fixes

MumbleClient/MumbleClient.csproj

@@ -39,8 +39,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>

MumbleClient/Program.cs

@@ -12,6 +12,8 @@ namespace MumbleClient
 {
     internal class Program
     {
+        private static Exception _updateLoopThreadException = null;
+
         private static void Main(string[] args)
         {
             string addr, name, pass;
@@ -59,8 +61,14 @@ private static void Main(string[] args)
             MumbleConnection connection = new MumbleConnection(new IPEndPoint(Dns.GetHostAddresses(addr).First(a => a.AddressFamily == AddressFamily.InterNetwork), port), protocol);
             connection.Connect(name, pass, new string[0], addr);
 
-            Thread t = new Thread(a => UpdateLoop(connection)) {IsBackground = true};
-            t.Start();
+            //Start the UpdateLoop thread, and collect a possible exception at termination
+            ThreadStart updateLoopThreadStart = new ThreadStart(() => UpdateLoop(connection, out _updateLoopThreadException));
+            updateLoopThreadStart += () => {
+                if(_updateLoopThreadException != null)
+                    throw new Exception($"{nameof(UpdateLoop)} was terminated unexpectedly because of a {_updateLoopThreadException.GetType().ToString()}", _updateLoopThreadException);
+            };
+            Thread updateLoopThread = new Thread(updateLoopThreadStart) {IsBackground = true};
+            updateLoopThread.Start();
 
             var r = new MicrophoneRecorder(protocol);
 
@@ -92,11 +100,21 @@ private static void DrawChannel(string indent, IEnumerable<Channel> channels, IE
                 DrawChannel(indent + "\t", channels, users, channel);
         }
 
-        private static void UpdateLoop(MumbleConnection connection)
+        private static void UpdateLoop(MumbleConnection connection, out Exception exception)
         {
-            while (connection.State != ConnectionStates.Disconnected)
+            exception = null;
+            try
+            {
+                while (connection.State != ConnectionStates.Disconnected)
+                {
+                    if (connection.Process())
+                        Thread.Yield();
+                    else
+                        Thread.Sleep(1);
+                }
+            } catch (Exception ex)
             {
-                connection.Process();
+                exception = ex;
             }
         }
     }

MumbleClient/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NAudio" version="1.9.0" targetFramework="net45" />
+  <package id="NAudio" version="1.10.0" targetFramework="net45" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net45" />
 </packages>

MumbleGuiClient/Form1.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using MumbleSharp;
@@ -251,7 +252,10 @@ private void btnSend_Click(object sender, EventArgs e)
         private void mumbleUpdater_Tick(object sender, EventArgs e)
         {
             if (connection != null)
-                connection.Process();
+                if (connection.Process())
+                    Thread.Yield();
+                else
+                    Thread.Sleep(1);
         }
 
         private void tvUsers_MouseDoubleClick(object sender, MouseEventArgs e)
@@ -457,6 +461,7 @@ private void btnConnect_Click(object sender, EventArgs e)
             while (connection.Protocol.LocalUser == null)
             {
                 connection.Process();
+                Thread.Sleep(1);
             }
         }
 

MumbleGuiClient/MumbleGuiClient.csproj

@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

MumbleGuiClient/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NAudio" version="1.9.0" targetFramework="net45" />
+  <package id="NAudio" version="1.10.0" targetFramework="net45" />
 </packages>

MumbleSharp/Audio/AudioDecodingBuffer.cs

@@ -69,6 +69,9 @@ public int Read(byte[] buffer, int offset, int count)
         /// <param name="codec">The codec to use to decode this packet</param>
         public void AddEncodedPacket(long sequence, byte[] data, IVoiceCodec codec)
         {
+            if(sequence == 0)
+                _nextSequenceToDecode = 0;
+
             if (_codec == null)
                 _codec = codec;
             else if (_codec != null && _codec != codec)

MumbleSharp/Audio/AudioEncodingBuffer.cs

@@ -45,7 +45,7 @@ public void Stop()
             _unencodedBuffer.Add(new TargettedSpeech(stop: true));
         }
 
-        public byte[] Encode(SpeechCodecs codec)
+        public EncodedTargettedSpeech? Encode(SpeechCodecs codec)
         {
             //Get the codec
             var codecInstance = _codecs.GetCodec(codec);
@@ -95,7 +95,10 @@ public byte[] Encode(SpeechCodecs codec)
                 byte[] b = new byte[frameBytes];
                 int read = _pcmBuffer.Read(new ArraySegment<byte>(b));
 
-                return codecInstance.Encode(new ArraySegment<byte>(b, 0, read));
+                return new EncodedTargettedSpeech(
+                    codecInstance.Encode(new ArraySegment<byte>(b, 0, read)),
+                    _target,
+                    _targetId);
             }
             else
             {
@@ -107,7 +110,10 @@ public byte[] Encode(SpeechCodecs codec)
                     byte[] b = new byte[frameBytes];
                     int read = _pcmBuffer.Read(new ArraySegment<byte>(b));
 
-                    return codecInstance.Encode(new ArraySegment<byte>(b, 0, read));
+                    return new EncodedTargettedSpeech(
+                        codecInstance.Encode(new ArraySegment<byte>(b, 0, read)),
+                        _target,
+                        _targetId);
                 }
                 else return null;
             }
@@ -133,6 +139,20 @@ private bool TryAddToEncodingBuffer(TargettedSpeech t, out bool stopped)
             return true;
         }
 
+        public struct EncodedTargettedSpeech
+        {
+            public readonly byte[] EncodedPcm;
+            public readonly SpeechTarget Target;
+            public readonly uint TargetId;
+
+            public EncodedTargettedSpeech(byte[] encodedPcm, SpeechTarget target, uint targetId)
+            {
+                TargetId = targetId;
+                Target = target;
+                EncodedPcm = encodedPcm;
+            }
+        }
+
         /// <summary>
         /// PCM data targetted at a specific person
         /// </summary>