com.adrenak.univoice 2.0.2 → 3.0.0

package/CHANGELOG.md

@@ -1,67 +1,67 @@
-## [2.0.2](https://github.com/adrenak/univoice/compare/v2.0.1...v2.0.2) (2022-11-02)
-
-
-### Bug Fixes
-
-* remove comment about possible PeerID in IAudioOutput ([2246bb2](https://github.com/adrenak/univoice/commit/2246bb2bef234b84bdf6cd55a9faf87e09133953))
-
-## [1.2.1](https://github.com/adrenak/univoice/compare/v1.2.0...v1.2.1) (2022-10-10)
-
-
-### Bug Fixes
-
-* PeersOutputs gets filled as peers join, not when they start ([42eaeb9](https://github.com/adrenak/univoice/commit/42eaeb95eef4eea7ee559da9fdbcac78ceb941b4))
-
-# [1.2.0](https://github.com/adrenak/univoice/compare/v1.1.4...v1.2.0) (2022-09-20)
-
-
-### Bug Fixes
-
-* Update README.md ([5c234ee](https://github.com/adrenak/univoice/commit/5c234ee1e6aad430f72b4879a401bb98f3e68b88))
-
-
-### Features
-
-* Remove inbuilt implementations. Remove samples. ([dbfc4c0](https://github.com/adrenak/univoice/commit/dbfc4c0a1ffd99d03aefe72aec0e27debe68525a))
-
-## [1.1.4](https://github.com/adrenak/univoice/compare/v1.1.3...v1.1.4) (2021-08-10)
-
-
-### Bug Fixes
-
-* Spell-fix in README ([fcbc7c6](https://github.com/adrenak/univoice/commit/fcbc7c6c28c84415a50050d7014ecdfc39347309))
-
-## [1.1.3](https://github.com/adrenak/univoice/compare/v1.1.2...v1.1.3) (2021-06-03)
-
-
-### Bug Fixes
-
-* Add missing mute others toggle in sample scene. ([cff9574](https://github.com/adrenak/univoice/commit/cff9574bdd4b769de519f451e489b9dcdb76f649))
-
-## [1.1.2](https://github.com/adrenak/univoice/compare/v1.1.1...v1.1.2) (2021-06-02)
-
-
-### Bug Fixes
-
-* README fix ([d03db44](https://github.com/adrenak/univoice/commit/d03db449e1fe2557a57df75ccfc8fe4a310f308f))
-
-## [1.1.1](https://github.com/adrenak/univoice/compare/v1.1.0...v1.1.1) (2021-06-02)
-
-
-### Bug Fixes
-
-* Prevent sample app screen from sleeping. ([545d96f](https://github.com/adrenak/univoice/commit/545d96f16b858ba1dbdb01de5298ba62c06c2725))
-
-# [1.1.0](https://github.com/adrenak/univoice/compare/v1.0.0...v1.1.0) (2021-06-02)
-
-
-### Features
-
-* InbuiltAudioOutput now also accepts minimum segment count and ([294bfef](https://github.com/adrenak/univoice/commit/294bfef5677d49cd941b513c421980cf6a5e393f))
-
-# 1.0.0 (2021-06-02)
-
-
-### Features
-
-* Full rebuild with AirPeer 1.2.0 ([9327b2a](https://github.com/adrenak/univoice/commit/9327b2a05da766e91bad5f8e6288e5c328ded429))
+## [2.0.2](https://github.com/adrenak/univoice/compare/v2.0.1...v2.0.2) (2022-11-02)
+
+
+### Bug Fixes
+
+* remove comment about possible PeerID in IAudioOutput ([2246bb2](https://github.com/adrenak/univoice/commit/2246bb2bef234b84bdf6cd55a9faf87e09133953))
+
+## [1.2.1](https://github.com/adrenak/univoice/compare/v1.2.0...v1.2.1) (2022-10-10)
+
+
+### Bug Fixes
+
+* PeersOutputs gets filled as peers join, not when they start ([42eaeb9](https://github.com/adrenak/univoice/commit/42eaeb95eef4eea7ee559da9fdbcac78ceb941b4))
+
+# [1.2.0](https://github.com/adrenak/univoice/compare/v1.1.4...v1.2.0) (2022-09-20)
+
+
+### Bug Fixes
+
+* Update README.md ([5c234ee](https://github.com/adrenak/univoice/commit/5c234ee1e6aad430f72b4879a401bb98f3e68b88))
+
+
+### Features
+
+* Remove inbuilt implementations. Remove samples. ([dbfc4c0](https://github.com/adrenak/univoice/commit/dbfc4c0a1ffd99d03aefe72aec0e27debe68525a))
+
+## [1.1.4](https://github.com/adrenak/univoice/compare/v1.1.3...v1.1.4) (2021-08-10)
+
+
+### Bug Fixes
+
+* Spell-fix in README ([fcbc7c6](https://github.com/adrenak/univoice/commit/fcbc7c6c28c84415a50050d7014ecdfc39347309))
+
+## [1.1.3](https://github.com/adrenak/univoice/compare/v1.1.2...v1.1.3) (2021-06-03)
+
+
+### Bug Fixes
+
+* Add missing mute others toggle in sample scene. ([cff9574](https://github.com/adrenak/univoice/commit/cff9574bdd4b769de519f451e489b9dcdb76f649))
+
+## [1.1.2](https://github.com/adrenak/univoice/compare/v1.1.1...v1.1.2) (2021-06-02)
+
+
+### Bug Fixes
+
+* README fix ([d03db44](https://github.com/adrenak/univoice/commit/d03db449e1fe2557a57df75ccfc8fe4a310f308f))
+
+## [1.1.1](https://github.com/adrenak/univoice/compare/v1.1.0...v1.1.1) (2021-06-02)
+
+
+### Bug Fixes
+
+* Prevent sample app screen from sleeping. ([545d96f](https://github.com/adrenak/univoice/commit/545d96f16b858ba1dbdb01de5298ba62c06c2725))
+
+# [1.1.0](https://github.com/adrenak/univoice/compare/v1.0.0...v1.1.0) (2021-06-02)
+
+
+### Features
+
+* InbuiltAudioOutput now also accepts minimum segment count and ([294bfef](https://github.com/adrenak/univoice/commit/294bfef5677d49cd941b513c421980cf6a5e393f))
+
+# 1.0.0 (2021-06-02)
+
+
+### Features
+
+* Full rebuild with AirPeer 1.2.0 ([9327b2a](https://github.com/adrenak/univoice/commit/9327b2a05da766e91bad5f8e6288e5c328ded429))

package/CHANGELOG.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 0d7539eaf2ef9674d9822b7ae65e72b5
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0d7539eaf2ef9674d9822b7ae65e72b5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2018 Vatsal Ambastha
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2018 Vatsal Ambastha
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/LICENSE.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 789be013ec943714a826e42a9d7db452
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 789be013ec943714a826e42a9d7db452
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/README.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: b497ccbc9f4029f4593611f820e24235
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: b497ccbc9f4029f4593611f820e24235
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Adrenak.UniVoice.Runtime.asmdef

@@ -1,3 +1,3 @@
-{
-	"name": "Adrenak.UniVoice.Runtime"
-}
+{
+	"name": "Adrenak.UniVoice.Runtime"
+}

package/Runtime/Adrenak.UniVoice.Runtime.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 6b289bb677194eb40b60db3a566aab7b
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 6b289bb677194eb40b60db3a566aab7b
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/ChatroomAgent.cs

@@ -1,12 +1,17 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using System.Diagnostics;
+
+using Debug = UnityEngine.Debug;
 
 namespace Adrenak.UniVoice {
     /// <summary>
     /// Provides the means to host or connect to a chatroom.
     /// </summary>
     public class ChatroomAgent : IDisposable {
+        const string TAG = "ChatroomAgent";
+
         // ====================================================================
         #region PROPERTIES
         // ====================================================================
@@ -33,14 +38,29 @@ namespace Adrenak.UniVoice {
         /// There is a <see cref="IAudioOutput"/> for each peer that gets
         /// created using the provided <see cref="AudioOutputFactory"/>
         /// The <see cref="IAudioOutput"/> instance corresponding to a peer is
-        /// responsible for playing the audio that we receive that peer. 
+        /// responsible for playing the audio that we receive from that peer. 
         /// </summary>
         public Dictionary<short, IAudioOutput> PeerOutputs;
 
+        /// <summary>
+        /// Fired when the <see cref="CurrentMode"/> changes.
+        /// </summary>
+        public Action<ChatroomAgentMode> OnModeChanged;
+
         /// <summary>
         /// The current <see cref="ChatroomAgentMode"/> of this agent
         /// </summary>
-        public ChatroomAgentMode CurrentMode { get; private set; }
+        public ChatroomAgentMode CurrentMode {
+            get => _currentMode;
+            private set {
+                if(_currentMode != value) {
+                    _currentMode = value;
+                    OnModeChanged?.Invoke(value);
+                    Debug.unityLogger.Log(TAG, "Current Mode set to " + value);
+                }
+            }
+        }
+        ChatroomAgentMode _currentMode = ChatroomAgentMode.Unconnected;
 
         /// <summary>
         /// Mutes all the peers. If set to true, no incoming audio from other 
@@ -69,14 +89,14 @@ namespace Adrenak.UniVoice {
         #endregion
 
         // ====================================================================
-        #region CONSTRUCTION / DISPOSAL
+        #region CONSTRUCTION AND DISPOSAL
         // ====================================================================
         /// <summary>
         /// Creates and returns a new agent using the provided dependencies.
         /// The instance then makes the dependencies work together.
         /// </summary>
         /// 
-        /// <param name="chatroomNetwork">The chatroom network implementation
+        /// <param name="chatroomNetwork">The chatroom network implementation  
         /// for chatroom access and sending data to peers in a chatroom.
         /// </param>
         /// 
@@ -106,7 +126,8 @@ namespace Adrenak.UniVoice {
             PeerSettings = new Dictionary<short, ChatroomPeerSettings>();
             PeerOutputs = new Dictionary<short, IAudioOutput>();
 
-            LinkDependencies();
+            Debug.unityLogger.Log(TAG, "Created");
+            SetupEventListeners();
         }
 
         /// <summary>
@@ -116,6 +137,7 @@ namespace Adrenak.UniVoice {
         /// instances and/or using them outside this instance.
         /// </summary>
         public void Dispose() {
+            Debug.unityLogger.Log(TAG, "Disposing");
             AudioInput.Dispose();
 
             RemoveAllPeers();
@@ -123,53 +145,62 @@ namespace Adrenak.UniVoice {
             PeerOutputs.Clear();
 
             Network.Dispose();
+            Debug.unityLogger.Log(TAG, "Disposed");
         }
         #endregion
 
         // ====================================================================
         #region INTERNAL 
         // ====================================================================
-        void LinkDependencies() {
+        void SetupEventListeners() {
+            Debug.unityLogger.Log(TAG, "Setting up events.");
+
             // Network events
-            Network.OnCreatedChatroom += () =>
+            Network.OnCreatedChatroom += () => {
+                Debug.unityLogger.Log(TAG, "Chatroom created.");
                 CurrentMode = ChatroomAgentMode.Host;
+            };
             Network.OnClosedChatroom += () => {
-                CurrentMode = ChatroomAgentMode.Unconnected;
+                Debug.unityLogger.Log(TAG, "Chatroom closed.");
                 RemoveAllPeers();
+                CurrentMode = ChatroomAgentMode.Unconnected;
             };
             Network.OnJoinedChatroom += id => {
+                Debug.unityLogger.Log(TAG, "Joined chatroom.");
                 CurrentMode = ChatroomAgentMode.Guest;
             };
             Network.OnLeftChatroom += () => {
+                Debug.unityLogger.Log(TAG, "Left chatroom.");
                 RemoveAllPeers();
                 CurrentMode = ChatroomAgentMode.Unconnected;
             };
-            Network.OnPeerJoinedChatroom += id => 
+            Network.OnPeerJoinedChatroom += id => {
+                Debug.unityLogger.Log(TAG, "New peer joined: " + id);
                 AddPeer(id);
-            Network.OnPeerLeftChatroom += id =>
+            };
+            Network.OnPeerLeftChatroom += id => {
+                Debug.unityLogger.Log(TAG, "Peer left: " + id);
                 RemovePeer(id);
+            };
 
             // Stream the incoming audio data using the right peer output
             Network.OnAudioReceived += (peerID, data) => {
-                // if we're muting all, no point continuing.
+                // if we're muting all, do nothing.
                 if (MuteOthers) return;
 
-                var index = data.segmentIndex;
-                var frequency = data.frequency;
-                var channels = data.channelCount;
-                var samples = data.samples;
-
-                if (PeerSettings.ContainsKey(peerID) && !PeerSettings[peerID].muteThem)
-                    PeerOutputs[peerID].Feed(index, frequency, channels, samples);
+                if (AllowIncomingAudioFromPeer(peerID))
+                    PeerOutputs[peerID].Feed(data);
             };
 
             AudioInput.OnSegmentReady += (index, samples) => {
-                // If we're muting ourselves to all, no point continuing
+                if (CurrentMode == ChatroomAgentMode.Unconnected) return;
+                
+                // If we're muting ourselves to all, do nothing.
                 if (MuteSelf) return;
 
                 // Get all the recipients we haven't muted ourselves to
                 var recipients = Network.PeerIDs
-                    .Where(x => PeerSettings.ContainsKey(x) && !PeerSettings[x].muteSelf);
+                    .Where(id => AllowOutgoingAudioToPeer(id));
 
                 // Send the audio segment to every deserving recipient
                 foreach (var recipient in recipients)
@@ -180,34 +211,48 @@ namespace Adrenak.UniVoice {
                         samples = samples
                     });
             };
+            Debug.unityLogger.Log(TAG, "Event setup completed.");
         }
 
         void AddPeer(short id) {
-            if (!PeerSettings.ContainsKey(id))
-                PeerSettings.Add(id, new ChatroomPeerSettings());
-            if(!PeerOutputs.ContainsKey(id)) {
-                var output = AudioOutputFactory.Create(
-                    AudioInput.Frequency,
-                    AudioInput.ChannelCount,
-                    AudioInput.Frequency * AudioInput.ChannelCount / AudioInput.SegmentRate
-                );
-                output.ID = id.ToString();
-                PeerOutputs.Add(id, output);
-            }
+            // Ensure no old settings or outputs exist for this ID.
+            RemovePeer(id);
+
+            PeerSettings.Add(id, new ChatroomPeerSettings());
+            
+            var output = AudioOutputFactory.Create(
+                AudioInput.Frequency,
+                AudioInput.ChannelCount,
+                AudioInput.Frequency * AudioInput.ChannelCount / AudioInput.SegmentRate
+            );
+            output.ID = id.ToString();
+            PeerOutputs.Add(id, output);
+            Debug.unityLogger.Log(TAG, "Added peer " + id);
         }
 
         void RemovePeer(short id) {
-            if (PeerSettings.ContainsKey(id))
+            if (PeerSettings.ContainsKey(id)) {
                 PeerSettings.Remove(id);
+                Debug.unityLogger.Log(TAG, "Removed peer settings for ID " + id);
+            }
             if (PeerOutputs.ContainsKey(id)) {
                 PeerOutputs[id].Dispose();
                 PeerOutputs.Remove(id);
+                Debug.unityLogger.Log(TAG, "Removed peer output for ID " + id);
             }
         }
 
+        bool AllowIncomingAudioFromPeer(short id) {
+            return PeerSettings.ContainsKey(id) && !PeerSettings[id].muteThem;
+        }
+
+        bool AllowOutgoingAudioToPeer(short id) {
+            return PeerSettings.ContainsKey(id) && !PeerSettings[id].muteSelf;
+        }
+
         void RemoveAllPeers() {
-            var peers = Network.PeerIDs;
-            foreach(var peer in peers) 
+            Debug.unityLogger.Log(TAG, "Removing all peers");
+            foreach(var peer in Network.PeerIDs) 
                 RemovePeer(peer);
         }
         #endregion

package/Runtime/ChatroomAgent.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 76706adfc97ef7d44823aa51d618267d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 76706adfc97ef7d44823aa51d618267d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Interfaces/IAudioInput.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: d56c2c84daac5494b93669532bca0b98
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: d56c2c84daac5494b93669532bca0b98
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Interfaces/IAudioOutput.cs

@@ -5,9 +5,9 @@ namespace Adrenak.UniVoice {
     /// Responsible for playing audio that is sent to it. 
     /// You'd normally want a <see cref="UnityEngine.AudioSource"/> 
     /// based implementation to play the audio in Unity. But this class can 
-    /// be used in other ways just as streaming the received audio to a server
+    /// be used in other ways such as streaming the received audio to a server
     /// or writing it to a local file. It's just an audio output and the 
-    /// destination doesn't matter.
+    /// destination depends on your implementation.
     /// </summary>
     public interface IAudioOutput : IDisposable {
         /// <summary>
@@ -34,10 +34,12 @@ namespace Adrenak.UniVoice {
         /// <param name="audioSamples">
         /// The audio samples/segment being fed
         /// </param>
-        void Feed(int segmentIndex,
-            int frequency,
-            int channelCount,
-            float[] audioSamples
-        );
+        void Feed(int segmentIndex, int frequency, int channelCount, float[] audioSamples);
+
+        /// <summary>
+        /// Feeds a <see cref="ChatroomAudioSegment"/> object to the audio output.
+        /// </summary>
+        /// <param name="segment">The audio data to be sent.</param>
+        void Feed(ChatroomAudioSegment segment);
     }
 }

package/Runtime/Interfaces/IAudioOutput.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 7d34118811133f44eb7ba1b5c3f6bb77
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7d34118811133f44eb7ba1b5c3f6bb77
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Interfaces/IAudioOutputFactory.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 095ec1523c98b7f4997c105a06856823
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 095ec1523c98b7f4997c105a06856823
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Interfaces/IChatroomNetwork.cs

@@ -46,26 +46,30 @@ namespace Adrenak.UniVoice {
         /// <summary>
         /// Fired when a peer joins the chatroom. 
         /// Provides the ID of the peer as event data.
-        /// This action also MUST be called for all previously
-        /// existing peers when we connect to a network.
+        /// NOTE: This action also MUST be called for all previously
+        /// existing peers when a local user connects to a network.
+        /// This allows the local user to know about the users that
+        /// were in the chatroom before they joined.
         /// </summary>
         event Action<short> OnPeerJoinedChatroom;
 
         /// <summary>
         /// Fired when a peer leaves the chatroom. 
         /// Provides the ID of the peer as event data.
-        /// This also also MUST be called for all peers
-        /// when we leave a network.
         /// </summary>
         event Action<short> OnPeerLeftChatroom;
 
         /// <summary>
         /// Fired when the network receives audio data from a peer. 
+        /// The first argument is the ID of the user the audio came from.
+        /// The second is the audio segment.
         /// </summary>
         event Action<short, ChatroomAudioSegment> OnAudioReceived;
 
         /// <summary>
         /// Fired when the local user sets audio data to a peer.
+        /// The first argument is the ID of the user the audio was sent to.
+        /// The second is the audio segment.
         /// </summary>
         event Action<short, ChatroomAudioSegment> OnAudioSent;
         #endregion
@@ -96,19 +100,19 @@ namespace Adrenak.UniVoice {
         /// <summary>
         /// Closes a chatroom that the local user is hosting
         /// </summary>
-        /// <param name="data">Any arguments for closing the room</param>
+        /// <param name="data">Any arguments used for closing the chatroom</param>
         void CloseChatroom(object data = null);
 
         /// <summary>
         /// Joins a chatroom
         /// </summary>
-        /// <param name="data">The name of the chatroom to join</param>
+        /// <param name="data">Any arguments used to join a chatroom</param>
         void JoinChatroom(object data = null);
 
         /// <summary>
         /// Leaves the chatroom the local user is currently in, if any
         /// </summary>
-        /// <param name="data">Any arguments for leaving the room</param>
+        /// <param name="data">Any arguments used to leave a chatroom</param>
         void LeaveChatroom(object data = null);
 
         /// <summary>

package/Runtime/Interfaces/IChatroomNetwork.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 11ba8951ad10dc84a963ca3c32cda48a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 11ba8951ad10dc84a963ca3c32cda48a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Interfaces.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: a0b094f3fe5bc624fae2ffb1e18c19a1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: a0b094f3fe5bc624fae2ffb1e18c19a1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Types/ChatroomAgentMode.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 95ab24cb9f03b8c4c8f22f567259def4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 95ab24cb9f03b8c4c8f22f567259def4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Types/ChatroomAudioSegment.cs

@@ -1,27 +1,27 @@
-namespace Adrenak.UniVoice {
-    [System.Serializable]
-    /// <summary>
-    /// A data structure representing the audio transmitted over the network.
-    /// </summary>
-    public struct ChatroomAudioSegment {
-        /// <summary>
-        /// The segment index of the audio samples
-        /// </summary>
-        public int segmentIndex;
-
-        /// <summary>
-        /// The frequency (or sampling rate) of the audio
-        /// </summary>
-        public int frequency;
-
-        /// <summary>
-        /// THe number of channels in the audio
-        /// </summary>
-        public int channelCount;
-
-        /// <summary>
-        /// A float array representing the audio sample data
-        /// </summary>
-        public float[] samples;
-    }
+namespace Adrenak.UniVoice {
+    [System.Serializable]
+    /// <summary>
+    /// A data structure representing the audio transmitted over the network.
+    /// </summary>
+    public struct ChatroomAudioSegment {
+        /// <summary>
+        /// The segment index of the audio samples
+        /// </summary>
+        public int segmentIndex;
+
+        /// <summary>
+        /// The frequency (or sampling rate) of the audio
+        /// </summary>
+        public int frequency;
+
+        /// <summary>
+        /// THe number of channels in the audio
+        /// </summary>
+        public int channelCount;
+
+        /// <summary>
+        /// A float array representing the audio sample data
+        /// </summary>
+        public float[] samples;
+    }
 }

package/Runtime/Types/ChatroomAudioSegment.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: e3c9ef93e574acf4094f05ab7346bfd5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e3c9ef93e574acf4094f05ab7346bfd5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Types/ChatroomPeerSettings.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 8aa96a7270a41ab42a055ed9a5bcfacd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 8aa96a7270a41ab42a055ed9a5bcfacd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Types.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: af3826214be11544e9a38629b9c93566
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: af3826214be11544e9a38629b9c93566
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime.meta

@@ -1,9 +1,9 @@
-fileFormatVersion: 2
-guid: e1b2e834bd331324e9157c87f86d1143
-folderAsset: yes
-timeCreated: 1547895114
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e1b2e834bd331324e9157c87f86d1143
+folderAsset: yes
+timeCreated: 1547895114
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -1,20 +1,29 @@
-{
-  "name": "com.adrenak.univoice",
-  "version": "2.0.2",
-  "displayName": "Adrenak.UniVoice",
-  "description": "Voice chat/VoIP solution for Unity.",
-  "unity": "2019.4",
-  "author": "Vatsal Ambastha <ambastha.vatsal@gmail.com> (http://www.vatsalambastha.com)",
-  "license": "MIT",
-  "keywords": [
-    "Peer To Peer",
-    "WebRTC",
-    "P2P",
-    "Networking",
-    "Voice Chat",
-    "voip"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  }
-}
+{
+    "name": "com.adrenak.univoice",
+    "version": "3.0.0",
+    "displayName": "Adrenak.UniVoice",
+    "description": "Voice chat/VoIP solution for Unity.",
+    "unity": "2019.4",
+    "author": {
+        "name": "Vatsal Ambastha",
+        "email": "ambastha.vatsal@gmail.com",
+        "url": "http://www.vatsalambastha.com"
+    },
+    "license": "MIT",
+    "keywords": [
+        "Peer To Peer",
+        "WebRTC",
+        "P2P",
+        "Networking",
+        "Voice Chat",
+        "voip",
+        "Unity",
+        "Unity3d",
+        "VR",
+        "AR",
+        "Metaverse"
+    ],
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org"
+    }
+}

package/package.json.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 5677af848094d404f835a6468b36f003
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5677af848094d404f835a6468b36f003
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Extensions.cs

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-
-using UnityEngine;
-
-namespace Adrenak.UniVoice {
-    public static class Extensions {
-        /// <summary>
-        /// Returns the normalized position of the AudioSource on its AudioClip
-        /// </summary>
-        public static float GetCurrentPosition(this AudioSource source) {
-            return (float)source.timeSamples / source.clip.samples;
-        }
-
-        /// <summary>
-        /// Adds the given key to the dictionary with a value if the key
-        /// is not present before.
-        /// </summary>
-        /// <param name="t">The key to check and add</param>
-        /// <param name="k">The value if the key is added</param>
-        public static void EnsureKey<T, K>
-        (this Dictionary<T, K> dict, T t, K k) {
-            if (!dict.ContainsKey(t))
-                dict.Add(t, k);
-        }
-
-        /// <summary>
-        /// Ensures a key and value pair are in the dictionary
-        /// </summary>
-        /// <param name="t">The key to ensure</param>
-        /// <param name="k">The value associated with the key</param>
-        public static void EnsurePair<T, K>
-        (this Dictionary<T, K> dict, T t, K k) {
-            if (dict.ContainsKey(t))
-                dict[t] = k;
-            else
-                dict.Add(t, k);
-        }
-    }
-}

package/Runtime/Extensions.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 646602ab062d77543b3742e51d16658f
-timeCreated: 1547895114
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: