com.adrenak.univoice 1.2.1 → 2.0.0

package/Runtime/ChatroomAgent.cs

@@ -150,23 +150,21 @@ namespace Adrenak.UniVoice {
                 RemovePeer(id);
 
             // Stream the incoming audio data using the right peer output
-            Network.OnAudioReceived += data => {
+            Network.OnAudioReceived += (peerID, data) => {
                 // if we're muting all, no point continuing.
                 if (MuteOthers) return;
 
-                var id = data.id;
                 var index = data.segmentIndex;
                 var frequency = data.frequency;
                 var channels = data.channelCount;
                 var samples = data.samples;
 
-                EnsurePeerStreamer(id, frequency, channels, samples.Length);
+                EnsurePeerStreamer(peerID, frequency, channels, samples.Length);
 
-                if (HasSettingsForPeer(id) && !PeerSettings[id].muteThem)
-                    PeerOutputs[id].Feed(index, frequency, channels, samples);
+                if (HasSettingsForPeer(peerID) && !PeerSettings[peerID].muteThem)
+                    PeerOutputs[peerID].Feed(index, frequency, channels, samples);
             };
 
-
             AudioInput.OnSegmentReady += (index, samples) => {
                 if (MuteSelf) return;
 
@@ -179,8 +177,7 @@ namespace Adrenak.UniVoice {
 
                 // Send the audio segment to every deserving recipient
                 foreach (var recipient in recipients)
-                    Network.SendAudioSegment(new ChatroomAudioSegment {
-                        id = recipient,
+                    Network.SendAudioSegment(recipient, new ChatroomAudioSegment {
                         segmentIndex = index,
                         frequency = AudioInput.Frequency,
                         channelCount = AudioInput.ChannelCount,
@@ -208,9 +205,9 @@ namespace Adrenak.UniVoice {
         bool HasSettingsForPeer(short id) => PeerSettings.ContainsKey(id);
 
         void EnsurePeerStreamer(
-            short id, 
-            int frequency, 
-            int channels, 
+            short id,
+            int frequency,
+            int channels,
             int segmentLength
         ) {
             if (!PeerOutputs.ContainsKey(id) && PeerSettings.ContainsKey(id)) {

package/Runtime/Interfaces/IChatroomNetwork.cs

@@ -20,7 +20,7 @@ namespace Adrenak.UniVoice {
         /// Provides an exception as event data.
         /// </summary>
         event Action<Exception> OnChatroomCreationFailed;
-        
+
         /// <summary>
         /// Fired when a chatroom is closed.
         /// </summary>
@@ -58,12 +58,12 @@ namespace Adrenak.UniVoice {
         /// <summary>
         /// Fired when the network receives audio data from a peer. 
         /// </summary>
-        event Action<ChatroomAudioSegment> OnAudioReceived;
+        event Action<short, ChatroomAudioSegment> OnAudioReceived;
 
         /// <summary>
         /// Fired when the local user sets audio data to a peer.
         /// </summary>
-        event Action<ChatroomAudioSegment> OnAudioSent;
+        event Action<short, ChatroomAudioSegment> OnAudioSent;
         #endregion
 
         // ====================================================================
@@ -111,7 +111,7 @@ namespace Adrenak.UniVoice {
         /// Sends audio data over the network
         /// </summary>
         /// <param name="data">The data to be transmitted.</param>
-        void SendAudioSegment(ChatroomAudioSegment data);
+        void SendAudioSegment(short peerID, ChatroomAudioSegment data);
         #endregion
     }
 }

package/Runtime/Types/ChatroomAgentMode.cs

@@ -1,4 +1,5 @@
 namespace Adrenak.UniVoice {
+    [System.Serializable]
     /// <summary>
     /// Represents the mode that a <see cref="ChatroomAgent"/> is in.
     /// </summary>

package/Runtime/Types/ChatroomAudioSegment.cs

@@ -4,11 +4,6 @@
     /// A data structure representing the audio transmitted over the network.
     /// </summary>
     public struct ChatroomAudioSegment {
-        /// <summary>
-        /// ID of the peer that has sent the data
-        /// </summary>
-        public short id;
-
         /// <summary>
         /// The segment index of the audio samples
         /// </summary>

package/Runtime/Types/ChatroomPeerSettings.cs

@@ -1,4 +1,5 @@
 namespace Adrenak.UniVoice {
+    [System.Serializable]
     /// <summary>
     /// Represents settings associated with a peer in the chatroom
     /// </summary>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.adrenak.univoice",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "displayName": "Adrenak.UniVoice",
   "description": "Voice chat/VoIP solution for Unity.",
   "unity": "2019.4",