Codebase Cleanup/Restructure

SamboyCoding · SamboyCoding · commit 44c8d5cceaa1 · 2022-07-04T15:20:41.000+01:00
diff --git a/Fmod5Sharp.Tests/Fmod5ImaAdPcmTests.cs b/Fmod5Sharp.Tests/Fmod5ImaAdPcmTests.cs
@@ -1,4 +1,6 @@
 ﻿using System.Linq;
+using Fmod5Sharp.CodecRebuilders;
+using Fmod5Sharp.FmodTypes;
 using Xunit;
 
 namespace Fmod5Sharp.Tests
diff --git a/Fmod5Sharp.Tests/Fmod5SharpGcadPcmTests.cs b/Fmod5Sharp.Tests/Fmod5SharpGcadPcmTests.cs
@@ -1,4 +1,6 @@
-﻿using Xunit;
+﻿using Fmod5Sharp.CodecRebuilders;
+using Fmod5Sharp.FmodTypes;
+using Xunit;
 
 namespace Fmod5Sharp.Tests
 {
diff --git a/Fmod5Sharp.Tests/Fmod5SharpPcmTests.cs b/Fmod5Sharp.Tests/Fmod5SharpPcmTests.cs
@@ -1,4 +1,6 @@
-﻿using Xunit;
+﻿using Fmod5Sharp.CodecRebuilders;
+using Fmod5Sharp.FmodTypes;
+using Xunit;
 
 namespace Fmod5Sharp.Tests
 {
diff --git a/Fmod5Sharp.Tests/Fmod5SharpVorbisTests.cs b/Fmod5Sharp.Tests/Fmod5SharpVorbisTests.cs
@@ -1,4 +1,4 @@
-using Fmod5Sharp.FmodVorbis;
+using Fmod5Sharp.CodecRebuilders;
 using Xunit;
 
 namespace Fmod5Sharp.Tests
diff --git a/Fmod5Sharp/ChunkData/DspCoefficientsBlockData.cs b/Fmod5Sharp/ChunkData/DspCoefficientsBlockData.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Fmod5Sharp.FmodTypes;
 
 namespace Fmod5Sharp.ChunkData
 {
diff --git a/Fmod5Sharp/CodecRebuilders/FmodGcadPcmRebuilder.cs b/Fmod5Sharp/CodecRebuilders/FmodGcadPcmRebuilder.cs
@@ -2,10 +2,11 @@
 using System.IO;
 using System.Linq;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.FmodTypes;
 using Fmod5Sharp.Util;
 using NAudio.Wave;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.CodecRebuilders
 {
     public static class FmodGcadPcmRebuilder
     {
diff --git a/Fmod5Sharp/CodecRebuilders/FmodImaAdPcmRebuilder.cs b/Fmod5Sharp/CodecRebuilders/FmodImaAdPcmRebuilder.cs
@@ -1,10 +1,9 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
+﻿using System.IO;
+using Fmod5Sharp.FmodTypes;
 using Fmod5Sharp.Util;
 using NAudio.Wave;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.CodecRebuilders
 {
     public static class FmodImaAdPcmRebuilder
     {
diff --git a/Fmod5Sharp/CodecRebuilders/FmodPcmRebuilder.cs b/Fmod5Sharp/CodecRebuilders/FmodPcmRebuilder.cs
@@ -1,7 +1,8 @@
 ﻿using System.IO;
+using Fmod5Sharp.FmodTypes;
 using NAudio.Wave;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.CodecRebuilders
 {
     public static class FmodPcmRebuilder
     {
diff --git a/Fmod5Sharp/CodecRebuilders/FmodVorbisRebuilder.cs b/Fmod5Sharp/CodecRebuilders/FmodVorbisRebuilder.cs
@@ -5,19 +5,20 @@
 using System.Reflection;
 using System.Text.Json;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.FmodTypes;
 using Fmod5Sharp.Util;
 using OggVorbisEncoder;
 
-namespace Fmod5Sharp.FmodVorbis
+namespace Fmod5Sharp.CodecRebuilders
 {
     public static class FmodVorbisRebuilder
     {
         private static Dictionary<uint, FmodVorbisData>? headers;
 
         private static void LoadVorbisHeaders()
         {
-            using Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"Fmod5Sharp.FmodVorbis.vorbis_headers_converted.json")
-                                  ?? throw new Exception($"Embedded resources for vorbis header data not found, has the assembly been tampered with?");
+            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"Fmod5Sharp.Util.vorbis_headers_converted.json")
+                               ?? throw new Exception($"Embedded resources for vorbis header data not found, has the assembly been tampered with?");
             using StreamReader reader = new(stream);
 
             var jsonString = reader.ReadToEnd();
diff --git a/Fmod5Sharp/Fmod5Sharp.csproj b/Fmod5Sharp/Fmod5Sharp.csproj
@@ -27,7 +27,10 @@
     <ItemGroup>
       <None Remove="FmodVorbis\vorbis_headers.json" />
       <None Remove="FmodVorbis\vorbis_headers_converted.json" />
-      <EmbeddedResource Include="FmodVorbis\vorbis_headers_converted.json" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Include="Util\vorbis_headers_converted.json" />
     </ItemGroup>
 
 </Project>
diff --git a/Fmod5Sharp/FmodTypes/FmodAudioHeader.cs b/Fmod5Sharp/FmodTypes/FmodAudioHeader.cs
@@ -2,8 +2,9 @@
 using System.IO;
 using System.Linq;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.Util;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.FmodTypes
 {
 	public class FmodAudioHeader
 	{
diff --git a/Fmod5Sharp/FmodTypes/FmodAudioType.cs b/Fmod5Sharp/FmodTypes/FmodAudioType.cs
@@ -1,4 +1,4 @@
-﻿namespace Fmod5Sharp
+﻿namespace Fmod5Sharp.FmodTypes
 {
 	public enum FmodAudioType : uint
 	{
diff --git a/Fmod5Sharp/FmodTypes/FmodSample.cs b/Fmod5Sharp/FmodTypes/FmodSample.cs
@@ -1,8 +1,7 @@
-﻿using System;
-using System.Diagnostics.CodeAnalysis;
-using Fmod5Sharp.FmodVorbis;
+﻿using System.Diagnostics.CodeAnalysis;
+using Fmod5Sharp.CodecRebuilders;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.FmodTypes
 {
     public class FmodSample
     {
diff --git a/Fmod5Sharp/FmodTypes/FmodSampleChunk.cs b/Fmod5Sharp/FmodTypes/FmodSampleChunk.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.IO;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.Util;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.FmodTypes
 {
 	internal class FmodSampleChunk : IBinaryReadable
 	{
diff --git a/Fmod5Sharp/FmodTypes/FmodSampleChunkType.cs b/Fmod5Sharp/FmodTypes/FmodSampleChunkType.cs
@@ -1,4 +1,4 @@
-﻿namespace Fmod5Sharp
+﻿namespace Fmod5Sharp.FmodTypes
 {
 	internal enum FmodSampleChunkType : uint
 	{
diff --git a/Fmod5Sharp/FmodTypes/FmodSampleMetadata.cs b/Fmod5Sharp/FmodTypes/FmodSampleMetadata.cs
@@ -1,7 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.IO;
+using Fmod5Sharp.Util;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.FmodTypes
 {
 	public class FmodSampleMetadata : IBinaryReadable
 	{
diff --git a/Fmod5Sharp/FmodTypes/FmodSoundBank.cs b/Fmod5Sharp/FmodTypes/FmodSoundBank.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.FmodTypes
 {
     public class FmodSoundBank
     {
diff --git a/Fmod5Sharp/FsbLoader.cs b/Fmod5Sharp/FsbLoader.cs
@@ -1,6 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Fmod5Sharp.FmodTypes;
+using Fmod5Sharp.Util;
 
 namespace Fmod5Sharp
 {
diff --git a/Fmod5Sharp/Util/Extensions.cs b/Fmod5Sharp/Util/Extensions.cs
@@ -1,7 +1,7 @@
 ﻿using System.IO;
 using System.Text;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.Util
 {
     internal static class Extensions
     {
diff --git a/Fmod5Sharp/Util/Fmod5SharpJsonContext.cs b/Fmod5Sharp/Util/Fmod5SharpJsonContext.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Fmod5Sharp.FmodVorbis;
 
 namespace Fmod5Sharp.Util;
 
diff --git a/Fmod5Sharp/Util/FmodAudioTypeExtensions.cs b/Fmod5Sharp/Util/FmodAudioTypeExtensions.cs
@@ -1,4 +1,6 @@
-﻿namespace Fmod5Sharp
+﻿using Fmod5Sharp.FmodTypes;
+
+namespace Fmod5Sharp.Util
 {
     public static class FmodAudioTypeExtensions
     {
diff --git a/Fmod5Sharp/Util/FmodVorbisData.cs b/Fmod5Sharp/Util/FmodVorbisData.cs
@@ -3,7 +3,7 @@
 using System.Text.Json.Serialization;
 using BitStreams;
 
-namespace Fmod5Sharp.FmodVorbis;
+namespace Fmod5Sharp.Util;
 
 internal class FmodVorbisData
 {
@@ -20,7 +20,7 @@ public FmodVorbisData(byte[] headerBytes, int seekBit)
         SeekBit = seekBit;
     }
 
-    [JsonIgnore] public byte[] BlockFlags { get; private set; } = Array.Empty<byte>();
+    [JsonIgnore] private byte[] BlockFlags { get; set; } = Array.Empty<byte>();
     
     private bool _initialized;
 
diff --git a/Fmod5Sharp/Util/IBinaryReadable.cs b/Fmod5Sharp/Util/IBinaryReadable.cs
@@ -1,6 +1,6 @@
 ﻿using System.IO;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.Util
 {
     internal interface IBinaryReadable
     {
diff --git a/Fmod5Sharp/Util/vorbis_headers_converted.json b/Fmod5Sharp/Util/vorbis_headers_converted.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Xunit;`
	`1`	`+using Fmod5Sharp.CodecRebuilders;`
	`2`	`+using Fmod5Sharp.FmodTypes;`
	`3`	`+using Xunit;`
`2`	`4`
`3`	`5`	`namespace Fmod5Sharp.Tests`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Fmod5Sharp.FmodVorbis;`
	`1`	`+using Fmod5Sharp.CodecRebuilders;`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`	`4`	`namespace Fmod5Sharp.Tests`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
	`5`	`+using Fmod5Sharp.FmodTypes;`
`5`	`6`
`6`	`7`	`namespace Fmod5Sharp.ChunkData`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Fmod5Sharp.ChunkData;`
	`5`	`+using Fmod5Sharp.FmodTypes;`
`5`	`6`	`using Fmod5Sharp.Util;`
`6`	`7`	`using NAudio.Wave;`
`7`	`8`
`8`		`-namespace Fmod5Sharp`
	`9`	`+namespace Fmod5Sharp.CodecRebuilders`
`9`	`10`	`{`
`10`	`11`	`public static class FmodGcadPcmRebuilder`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.IO;`
	`1`	`+using System.IO;`
	`2`	`+using Fmod5Sharp.FmodTypes;`
`4`	`3`	`using Fmod5Sharp.Util;`
`5`	`4`	`using NAudio.Wave;`
`6`	`5`
`7`		`-namespace Fmod5Sharp`
	`6`	`+namespace Fmod5Sharp.CodecRebuilders`
`8`	`7`	`{`
`9`	`8`	`public static class FmodImaAdPcmRebuilder`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`using System.IO;`
	`2`	`+using Fmod5Sharp.FmodTypes;`
`2`	`3`	`using NAudio.Wave;`
`3`	`4`
`4`		`-namespace Fmod5Sharp`
	`5`	`+namespace Fmod5Sharp.CodecRebuilders`
`5`	`6`	`{`
`6`	`7`	`public static class FmodPcmRebuilder`
`7`	`8`	`{`