From 9bd25a1aa18dfa8ef0a6ce5843d344cf214cd1dc Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Wed, 29 Jul 2020 08:30:03 +1000
Subject: [PATCH] Move some sound internals to Client.Common

---
 .../Sound/Interfaces/IBufferedSoundProvider.cs                  | 2 +-
 .../Sound/Interfaces/ISoundOutput.cs                            | 2 +-
 .../Sound/Utilities/BufferedAsync.cs                            | 2 +-
 .../Sound/Output/DirectSoundSoundOutput.cs                      | 2 ++
 src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs     | 2 ++
 src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs    | 2 ++
 src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs   | 2 ++
 .../Sound/Utilities/SoundOutputProvider.cs                      | 2 ++
 8 files changed, 13 insertions(+), 3 deletions(-)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Sound/Interfaces/IBufferedSoundProvider.cs (87%)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Sound/Interfaces/ISoundOutput.cs (86%)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Sound/Utilities/BufferedAsync.cs (96%)

diff --git a/src/BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs b/src/BizHawk.Client.Common/Sound/Interfaces/IBufferedSoundProvider.cs
similarity index 87%
rename from src/BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs
rename to src/BizHawk.Client.Common/Sound/Interfaces/IBufferedSoundProvider.cs
index f47c60b057..d95ea06cc9 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs
+++ b/src/BizHawk.Client.Common/Sound/Interfaces/IBufferedSoundProvider.cs
@@ -1,6 +1,6 @@
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	public interface IBufferedSoundProvider
 	{
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs b/src/BizHawk.Client.Common/Sound/Interfaces/ISoundOutput.cs
similarity index 86%
rename from src/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs
rename to src/BizHawk.Client.Common/Sound/Interfaces/ISoundOutput.cs
index 061c93d7ff..2b2ab9bbe2 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs
+++ b/src/BizHawk.Client.Common/Sound/Interfaces/ISoundOutput.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	public interface ISoundOutput : IDisposable
 	{
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs b/src/BizHawk.Client.Common/Sound/Utilities/BufferedAsync.cs
similarity index 96%
rename from src/BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs
rename to src/BizHawk.Client.Common/Sound/Utilities/BufferedAsync.cs
index f5845e0ee2..c2587c721d 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs
+++ b/src/BizHawk.Client.Common/Sound/Utilities/BufferedAsync.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	// Generates SEMI-synchronous sound, or "buffered asynchronous" sound.
 
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
index 24e07aa0c1..c6a29d38f7 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
+using BizHawk.Client.Common;
+
 using SlimDX.DirectSound;
 using SlimDX.Multimedia;
 
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
index b454c160d8..92934744db 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using BizHawk.Client.Common;
+
 namespace BizHawk.Client.EmuHawk
 {
 	public class DummySoundOutput : ISoundOutput
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
index 07706d113c..cd0041e8f3 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using BizHawk.Client.Common;
+
 using OpenTK.Audio;
 using OpenTK.Audio.OpenAL;
 
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
index bfe2037145..21d10235c5 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using BizHawk.Client.Common;
+
 using SlimDX;
 using SlimDX.Multimedia;
 using SlimDX.XAudio2;
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs b/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
index 01d3213475..9ec03e1498 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk