From 5cd11d0bb4a11ef2693f6fc7c6a4d3e6f01d23df Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 4 Mar 2016 08:37:09 -0500
Subject: [PATCH] Move Sound component objects from Emulation.Common to
Emulation.Cores so they live in the same assembly as the calling cores
---
.../BizHawk.Emulation.Common.csproj | 8 --------
.../BizHawk.Emulation.Cores.csproj | 8 ++++++++
.../Consoles/Coleco/ColecoVision.cs | 2 +-
.../Consoles/Nintendo/NES/Boards/ExROM.cs | 2 +-
.../Consoles/Nintendo/NES/Boards/Mapper069.cs | 2 +-
.../Consoles/Nintendo/NES/Boards/VRC6.cs | 2 +-
.../Consoles/PC Engine/PCEngine.cs | 2 +-
.../Consoles/PC Engine/ScsiCDBus.cs | 5 +----
.../Consoles/Sega/Genesis/Genesis.cs | 1 +
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs | 2 +-
.../Sound/CDAudio.cs | 3 +--
.../Sound/HuC6280PSG.cs | 3 ++-
.../Sound/MMC5Audio.cs | 2 +-
.../Sound/SN76489.cs | 11 +++++------
.../Sound/Sunsoft5BAudio.cs | 2 +-
.../Sound/VRC6Alt.cs | 2 +-
.../Sound/YM2413.cs | 0
.../Sound/YM2612.cs | 0
18 files changed, 27 insertions(+), 30 deletions(-)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/CDAudio.cs (95%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/HuC6280PSG.cs (95%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/MMC5Audio.cs (94%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/SN76489.cs (94%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/Sunsoft5BAudio.cs (94%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/VRC6Alt.cs (94%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/YM2413.cs (100%)
rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/Sound/YM2612.cs (100%)
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index bf888b499a..992b2cffe6 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -138,11 +138,6 @@
<Compile Include="Interfaces\Services\IVideoProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInjector.cs" />
- <Compile Include="Sound\CDAudio.cs" />
- <Compile Include="Sound\HuC6280PSG.cs" />
- <Compile Include="Sound\MMC5Audio.cs" />
- <Compile Include="Sound\SN76489.cs" />
- <Compile Include="Sound\Sunsoft5BAudio.cs" />
<Compile Include="Sound\Utilities\BlipBuffer.cs" />
<Compile Include="Sound\Utilities\BufferedAsync.cs" />
<Compile Include="Sound\Utilities\DCFilter.cs" />
@@ -151,9 +146,6 @@
<Compile Include="Sound\Utilities\SoundMixer.cs" />
<Compile Include="Sound\Utilities\SpeexResampler.cs" />
<Compile Include="Sound\Utilities\Waves.cs" />
- <Compile Include="Sound\VRC6Alt.cs" />
- <Compile Include="Sound\YM2413.cs" />
- <Compile Include="Sound\YM2612.cs" />
<Compile Include="SystemLookup.cs" />
<Compile Include="TextState.cs" />
</ItemGroup>
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 99f23f3401..b516657907 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -988,6 +988,14 @@
<Compile Include="Consoles\Sega\Genesis\MemoryMap.Z80.cs" />
<Compile Include="Consoles\Sega\SMS\SMS.cs" />
<Compile Include="Consoles\Sega\SMS\VDP.cs" />
+ <Compile Include="Sound\CDAudio.cs" />
+ <Compile Include="Sound\HuC6280PSG.cs" />
+ <Compile Include="Sound\MMC5Audio.cs" />
+ <Compile Include="Sound\SN76489.cs" />
+ <Compile Include="Sound\Sunsoft5BAudio.cs" />
+ <Compile Include="Sound\VRC6Alt.cs" />
+ <Compile Include="Sound\YM2413.cs" />
+ <Compile Include="Sound\YM2612.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Consoles\Coleco\docs\CV-Sound.txt" />
diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
index 102c9f5e59..43b9df32d2 100644
--- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
@@ -1,5 +1,5 @@
using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
using BizHawk.Emulation.Cores.Components.Z80;
namespace BizHawk.Emulation.Cores.ColecoVision
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
index 811c857057..20ec1ef121 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
@@ -2,7 +2,7 @@
using BizHawk.Common;
using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
//simplifications/approximations:
//* "Note that no commercial games rely on this mirroring -- therefore you can take the easy way out and simply give all MMC5 games 64k PRG-RAM."
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
index 3a076f3592..dbb0f12d35 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
@@ -1,6 +1,6 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
index a9b8500e4d..ab9caaedb0 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
@@ -2,7 +2,7 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index b9a1dbacec..29a04b41fe 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Globalization;
using System.IO;
using BizHawk.Common;
@@ -9,6 +8,7 @@ using BizHawk.Common.BufferExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
using BizHawk.Emulation.Cores.Components.H6280;
using BizHawk.Emulation.DiscSystem;
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
index acb0d77ad6..c0e7f1891b 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
@@ -1,11 +1,8 @@
using System;
-using System.IO;
-using System.Globalization;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.PCEngine
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
index 48f1faa3c8..0b48a33743 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
@@ -9,6 +9,7 @@ using BizHawk.Common.BufferExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
using BizHawk.Emulation.Cores.Components.M68000;
using BizHawk.Emulation.Cores.Components.Z80;
using Native68000;
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
index 622fe2afb3..af4b0d4027 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
@@ -1,9 +1,9 @@
using System;
-using System.Collections.Generic;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Components;
+using BizHawk.Emulation.Cores.Components;
using BizHawk.Emulation.Cores.Components.Z80;
/*****************************************************
diff --git a/BizHawk.Emulation.Common/Sound/CDAudio.cs b/BizHawk.Emulation.Cores/Sound/CDAudio.cs
similarity index 95%
rename from BizHawk.Emulation.Common/Sound/CDAudio.cs
rename to BizHawk.Emulation.Cores/Sound/CDAudio.cs
index 8d9c2234ed..39efff363f 100644
--- a/BizHawk.Emulation.Common/Sound/CDAudio.cs
+++ b/BizHawk.Emulation.Cores/Sound/CDAudio.cs
@@ -1,5 +1,4 @@
using System;
-using System.IO;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.DiscSystem;
@@ -9,7 +8,7 @@ using BizHawk.Emulation.DiscSystem;
// I decided not to let the perfect be the enemy of the good.
// It can always be refactored. It's at least deterministic.
-namespace BizHawk.Emulation.Common.Components
+namespace BizHawk.Emulation.Cores.Components
{
public sealed class CDAudio : ISoundProvider
{
diff --git a/BizHawk.Emulation.Common/Sound/HuC6280PSG.cs b/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
similarity index 95%
rename from BizHawk.Emulation.Common/Sound/HuC6280PSG.cs
rename to BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
index 6c4c1552b6..b32a8ae0d4 100644
--- a/BizHawk.Emulation.Common/Sound/HuC6280PSG.cs
+++ b/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
@@ -3,8 +3,9 @@ using System.Collections.Generic;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
+using BizHawk.Emulation.Common;
-namespace BizHawk.Emulation.Common.Components
+namespace BizHawk.Emulation.Cores.Components
{
// Emulates PSG audio unit of a PC Engine / Turbografx-16 / SuperGrafx.
// It is embedded on the CPU and doesn't have its own part number. None the less, it is emulated separately from the 6280 CPU.
diff --git a/BizHawk.Emulation.Common/Sound/MMC5Audio.cs b/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs
similarity index 94%
rename from BizHawk.Emulation.Common/Sound/MMC5Audio.cs
rename to BizHawk.Emulation.Cores/Sound/MMC5Audio.cs
index 9f2cddac04..ed81b55961 100644
--- a/BizHawk.Emulation.Common/Sound/MMC5Audio.cs
+++ b/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs
@@ -3,7 +3,7 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-namespace BizHawk.Emulation.Common.Components
+namespace BizHawk.Emulation.Cores.Components
{
public class MMC5Audio
{
diff --git a/BizHawk.Emulation.Common/Sound/SN76489.cs b/BizHawk.Emulation.Cores/Sound/SN76489.cs
similarity index 94%
rename from BizHawk.Emulation.Common/Sound/SN76489.cs
rename to BizHawk.Emulation.Cores/Sound/SN76489.cs
index 2c8ef985fe..4470184bfa 100644
--- a/BizHawk.Emulation.Common/Sound/SN76489.cs
+++ b/BizHawk.Emulation.Cores/Sound/SN76489.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using BizHawk.Common;
+using System.Collections.Generic;
-namespace BizHawk.Emulation.Common.Components
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Components
{
public sealed class SN76489 : ISoundProvider
{
diff --git a/BizHawk.Emulation.Common/Sound/Sunsoft5BAudio.cs b/BizHawk.Emulation.Cores/Sound/Sunsoft5BAudio.cs
similarity index 94%
rename from BizHawk.Emulation.Common/Sound/Sunsoft5BAudio.cs
rename to BizHawk.Emulation.Cores/Sound/Sunsoft5BAudio.cs
index e5b4996c99..7b06cc59cb 100644
--- a/BizHawk.Emulation.Common/Sound/Sunsoft5BAudio.cs
+++ b/BizHawk.Emulation.Cores/Sound/Sunsoft5BAudio.cs
@@ -3,7 +3,7 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-namespace BizHawk.Emulation.Common.Components
+namespace BizHawk.Emulation.Cores.Components
{
/// <summary>
/// YM2149F variant
diff --git a/BizHawk.Emulation.Common/Sound/VRC6Alt.cs b/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs
similarity index 94%
rename from BizHawk.Emulation.Common/Sound/VRC6Alt.cs
rename to BizHawk.Emulation.Cores/Sound/VRC6Alt.cs
index cbd60c0a5d..4e6bc84f0b 100644
--- a/BizHawk.Emulation.Common/Sound/VRC6Alt.cs
+++ b/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs
@@ -3,7 +3,7 @@
using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
-namespace BizHawk.Emulation.Common.Components
+namespace BizHawk.Emulation.Cores.Components
{
public class VRC6Alt
{
diff --git a/BizHawk.Emulation.Common/Sound/YM2413.cs b/BizHawk.Emulation.Cores/Sound/YM2413.cs
similarity index 100%
rename from BizHawk.Emulation.Common/Sound/YM2413.cs
rename to BizHawk.Emulation.Cores/Sound/YM2413.cs
diff --git a/BizHawk.Emulation.Common/Sound/YM2612.cs b/BizHawk.Emulation.Cores/Sound/YM2612.cs
similarity index 100%
rename from BizHawk.Emulation.Common/Sound/YM2612.cs
rename to BizHawk.Emulation.Cores/Sound/YM2612.cs