Add stream constructor

Kermalis · Oct 4, 2020 · 9af27eb · 9af27eb
1 parent 4772c0f
commit 9af27eb
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/DLS2/DLS.cs b/DLS2/DLS.cs
@@ -66,19 +66,28 @@ public DLS(string path)
         {
             using (var reader = new EndianBinaryReader(File.Open(path, FileMode.Open)))
             {
-                string str = reader.ReadString(4, false);
-                if (str != "RIFF")
-                {
-                    throw new InvalidDataException("RIFF header was not found at the start of the file.");
-                }
-                uint size = reader.ReadUInt32();
-                str = reader.ReadString(4, false);
-                if (str != "DLS ")
-                {
-                    throw new InvalidDataException("DLS header was not found at the expected offset.");
-                }
-                _chunks = DLSChunk.GetAllChunks(reader, reader.BaseStream.Position + (size - 4)); // Subtract 4 for the "DLS "
+                _chunks = Init(reader);
+            }
+        }
+        public DLS(Stream stream)
+        {
+            _chunks = Init(new EndianBinaryReader(stream));
+        }
+        private List<DLSChunk> Init(EndianBinaryReader reader)
+        {
+            string str = reader.ReadString(4, false);
+            if (str != "RIFF")
+            {
+                throw new InvalidDataException("RIFF header was not found at the start of the file.");
+            }
+            uint size = reader.ReadUInt32();
+            long endOffset = reader.BaseStream.Position + size;
+            str = reader.ReadString(4, false);
+            if (str != "DLS ")
+            {
+                throw new InvalidDataException("DLS header was not found at the expected offset.");
             }
+            return DLSChunk.GetAllChunks(reader, endOffset);
         }
 
         public void UpdateCollectionHeader()