review

Author: ike709

OpenDreamClient/Audio/DreamSoundEngine.cs

@@ -26,6 +26,8 @@ public void Initialize() {
         _sawmill = _logManager.GetSawmill("opendream.audio");
 
         _netManager.RegisterNetMessage<MsgSound>(RxSound);
+        _netManager.RegisterNetMessage<MsgSoundQuery>(RxSoundQuery);
+        _netManager.RegisterNetMessage<MsgSoundQueryResponse>();
 
         _netManager.Disconnect += DisconnectedFromServer;
     }
@@ -93,6 +95,14 @@ private void RxSound(MsgSound msg) {
         }
     }
 
+    private void RxSoundQuery(MsgSoundQuery soundQuery) {
+        var response = new MsgSoundQueryResponse {
+            PromptId = soundQuery.PromptId,
+            Sounds = GetSoundQuery()
+        };
+        _netManager.ClientSendMessage(response);
+    }
+
     public List<SoundData> GetSoundQuery() {
         List<SoundData> result = new List<SoundData>();
         foreach (var channel in _channels) {

OpenDreamClient/Interface/DreamInterfaceManager.cs

@@ -122,8 +122,6 @@ public void Initialize() {
         _netManager.RegisterNetMessage<MsgPrompt>(RxPrompt);
         _netManager.RegisterNetMessage<MsgPromptList>(RxPromptList);
         _netManager.RegisterNetMessage<MsgPromptResponse>();
-        _netManager.RegisterNetMessage<MsgSoundQuery>(RxSoundQuery);
-        _netManager.RegisterNetMessage<MsgSoundQueryResponse>();
         _netManager.RegisterNetMessage<MsgBrowse>(RxBrowse);
         _netManager.RegisterNetMessage<MsgTopic>();
         _netManager.RegisterNetMessage<MsgWinSet>(RxWinSet);
@@ -190,15 +188,6 @@ private void RxPromptList(MsgPromptList pPromptList) {
         ShowPrompt(prompt);
     }
 
-    private void RxSoundQuery(MsgSoundQuery soundQuery) {
-        var allSounds = _dreamSoundEngine.GetSoundQuery();
-        var response = new MsgSoundQueryResponse {
-            PromptId = soundQuery.PromptId,
-            Sounds = allSounds,
-        };
-        _netManager.ClientSendMessage(response);
-    }
-
     private void RxBrowse(MsgBrowse pBrowse) {
         var referencedElement = (pBrowse.Window != null) ? FindElementWithId(pBrowse.Window) : DefaultWindow;
 

OpenDreamRuntime/DreamConnection.cs

@@ -211,19 +211,17 @@ public void HandleMsgSoundQueryResponse(MsgSoundQueryResponse message) {
             return;
         }
 
-        DreamList allSounds = new DreamList(_objectTree.List.ObjectDefinition, message.Sounds?.Count ?? 0);
-        if (message.Sounds is not null) {
-            foreach (var soundData in message.Sounds) {
-                var sound = new DreamObjectSound(_objectTree.GetObjectDefinition(_objectTree.Sound.Id));
-                sound.SetVariableValue("channel", new DreamValue(soundData.Channel));
-                sound.SetVariableValue("offset", new DreamValue(soundData.Offset));
-                sound.SetVariableValue("volume", new DreamValue(soundData.Volume));
-                sound.SetVariableValue("len", new DreamValue(soundData.Length));
-                sound.SetVariableValue("repeat", new DreamValue(soundData.Repeat));
-                sound.SetVariableValue("file", string.IsNullOrEmpty(soundData.File) ? DreamValue.Null : new DreamValue(soundData.File));
-
-                allSounds.AddValue(new DreamValue(sound));
-            }
+        DreamList allSounds = _objectTree.CreateList(message.Sounds.Count);
+        foreach (var soundData in message.Sounds) {
+            var sound = _objectTree.CreateObject(_objectTree.Sound);
+            sound.SetVariableValue("channel", new DreamValue(soundData.Channel));
+            sound.SetVariableValue("offset", new DreamValue(soundData.Offset));
+            sound.SetVariableValue("volume", new DreamValue(soundData.Volume));
+            sound.SetVariableValue("len", new DreamValue(soundData.Length));
+            sound.SetVariableValue("repeat", new DreamValue(soundData.Repeat));
+            sound.SetVariableValue("file", string.IsNullOrEmpty(soundData.File) ? DreamValue.Null : new DreamValue(soundData.File));
+
+            allSounds.AddValue(new DreamValue(sound));
         }
 
         promptEvent.Invoke(new DreamValue(allSounds));

OpenDreamShared/Network/Messages/MsgSoundQueryResponse.cs

@@ -9,15 +9,15 @@ public sealed class MsgSoundQueryResponse : NetMessage {
     public override MsgGroups MsgGroup => MsgGroups.EntityEvent;
 
     public int PromptId;
-    public List<SoundData>? Sounds;
+    public required List<SoundData> Sounds;
 
     public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) {
         PromptId = buffer.ReadVariableInt32();
         var soundCount = buffer.ReadUInt16();
 
-        if(soundCount == 0) return;
+        Sounds = new List<SoundData>(soundCount);
 
-        Sounds ??= new List<SoundData>(soundCount);
+        if(soundCount == 0) return;
 
         for (var i = 0; i < soundCount; i++) {
             Sounds.Add(new SoundData(buffer));
@@ -27,11 +27,11 @@ public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer
     public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) {
         buffer.WriteVariableInt32(PromptId);
 
-        var soundCount = Sounds?.Count ?? 0;
+        var soundCount = Sounds.Count;
         buffer.Write((ushort)soundCount);
 
         for (var i = 0; i < soundCount; i++) {
-            Sounds![i].WriteToBuffer(buffer);
+            Sounds[i].WriteToBuffer(buffer);
         }
     }
 }