From 1f2484275501df6b44b66ab45b87bb766a8c09e0 Mon Sep 17 00:00:00 2001
From: Thog <me@thog.eu>
Date: Fri, 11 Oct 2019 03:42:55 +0200
Subject: [PATCH] Address gdkchan's comment

---
 Ryujinx.Common/Utilities/BitUtils.cs             | 14 --------------
 Ryujinx.Common/Utilities/EndianSwap.cs           | 16 +++++++++++++++-
 .../HOS/Services/Audio/Types/OpusPacketHeader.cs |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Ryujinx.Common/Utilities/BitUtils.cs b/Ryujinx.Common/Utilities/BitUtils.cs
index 4ac57cb455..5f70f742a0 100644
--- a/Ryujinx.Common/Utilities/BitUtils.cs
+++ b/Ryujinx.Common/Utilities/BitUtils.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Ryujinx.Common
 {
     public static class BitUtils
@@ -137,17 +135,5 @@ namespace Ryujinx.Common
 
             return (value >> 32) | (value << 32);
         }
-
-        public static uint FromBigEndianToPlatformEndian(uint data)
-        {
-            uint result = data;
-
-            if (BitConverter.IsLittleEndian)
-            {
-                result = (uint)EndianSwap.Swap32((int)result);
-            }
-
-            return result;
-        }
     }
 }
diff --git a/Ryujinx.Common/Utilities/EndianSwap.cs b/Ryujinx.Common/Utilities/EndianSwap.cs
index 6fe1d99522..049570e32a 100644
--- a/Ryujinx.Common/Utilities/EndianSwap.cs
+++ b/Ryujinx.Common/Utilities/EndianSwap.cs
@@ -1,4 +1,6 @@
-namespace Ryujinx.Common
+using System;
+
+namespace Ryujinx.Common
 {
     public static class EndianSwap
     {
@@ -13,5 +15,17 @@
                          ((uintVal <<  8) & 0x00ff0000) |
                          ((uintVal << 24) & 0xff000000));
         }
+
+        public static uint FromBigEndianToPlatformEndian(uint value)
+        {
+            uint result = value;
+
+            if (BitConverter.IsLittleEndian)
+            {
+                result = (uint)EndianSwap.Swap32((int)result);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Audio/Types/OpusPacketHeader.cs b/Ryujinx.HLE/HOS/Services/Audio/Types/OpusPacketHeader.cs
index 8601f85cb1..bb4b6d16c9 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/Types/OpusPacketHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/Types/OpusPacketHeader.cs
@@ -15,8 +15,8 @@ namespace Ryujinx.HLE.HOS.Services.Audio.Types
         {
             OpusPacketHeader header = reader.ReadStruct<OpusPacketHeader>();
 
-            header.length     = BitUtils.FromBigEndianToPlatformEndian(header.length);
-            header.finalRange = BitUtils.FromBigEndianToPlatformEndian(header.finalRange);
+            header.length     = EndianSwap.FromBigEndianToPlatformEndian(header.length);
+            header.finalRange = EndianSwap.FromBigEndianToPlatformEndian(header.finalRange);
 
             return header;
         }