More IAsyncSoundProvider and related classes to BizHawk.Emulation.Cores and make them internal, since they are implementation details, and they are deprecrated and not intended to be used in future cores.

BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj

@@ -126,7 +126,6 @@
     <Compile Include="Interfaces\IEmulatorServiceProvider.cs" />
     <Compile Include="Interfaces\Services\ICreateGameDBEntries.cs" />
     <Compile Include="Interfaces\Services\ISoundProvider.cs" />
-    <Compile Include="Interfaces\IAsyncSoundProvider.cs" />
     <Compile Include="Interfaces\Services\ICodeDataLogger.cs" />
     <Compile Include="Interfaces\Services\IDebuggable.cs" />
     <Compile Include="Interfaces\Services\IDisassemblable.cs" />
@@ -147,7 +146,6 @@
     <Compile Include="Sound\Utilities\DCFilter.cs" />
     <Compile Include="Sound\Utilities\Equalizer.cs" />
     <Compile Include="Sound\Utilities\Metaspu.cs" />
-    <Compile Include="Sound\Utilities\SoundMixer.cs" />
     <Compile Include="Sound\Utilities\SpeexResampler.cs" />
     <Compile Include="Sound\Utilities\Waves.cs" />
     <Compile Include="SystemLookup.cs" />

BizHawk.Emulation.Common/Sound/Utilities/Metaspu.cs

@@ -58,64 +58,6 @@ namespace BizHawk.Emulation.Common
 		}
 	}
 
-	// An async sound provider
-	// Sound refactor TODO: can this be combined with the other Metaspu?
-	public class MetaspuSoundProvider : ISoundProvider
-	{
-		public MetaspuSoundProvider(ESynchMethod method)
-		{
-			Buffer = Metaspu.metaspu_construct(method);
-		}
-
-		public ISynchronizingAudioBuffer Buffer { get; set; }
-		private readonly short[] pullBuffer = new short[1470];
-
-		public MetaspuSoundProvider()
-			: this(ESynchMethod.ESynchMethod_V)
-		{
-		}
-
-		public void PullSamples(IAsyncSoundProvider source)
-		{
-			Array.Clear(pullBuffer, 0, 1470);
-			source.GetSamples(pullBuffer);
-			Buffer.enqueue_samples(pullBuffer, 735);
-		}
-
-		public bool CanProvideAsync
-		{
-			get { return true; }
-		}
-
-		public SyncSoundMode SyncMode
-		{
-			get { return SyncSoundMode.Async; }
-		}
-
-		public void SetSyncMode(SyncSoundMode mode)
-		{
-			if (mode != SyncSoundMode.Async)
-			{
-				throw new NotSupportedException("Only Async mode is supported.");
-			}
-		}
-
-		public void GetSamplesSync(out short[] samples, out int nsamp)
-		{
-			throw new InvalidOperationException("Sync mode is not supported.");
-		}
-
-		public void GetSamplesAsync(short[] samples)
-		{
-			Buffer.output_samples(samples, samples.Length / 2);
-		}
-
-		public void DiscardSamples()
-		{
-			Buffer.clear();
-		}
-	}
-
 	public interface ISynchronizingAudioBuffer
 	{
 		void enqueue_samples(short[] buf, int samples_provided);

BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj

@@ -1197,8 +1197,10 @@
     <Compile Include="Consoles\Sega\Genesis\MemoryMap.Z80.cs" />
     <Compile Include="Sound\CDAudio.cs" />
     <Compile Include="Sound\HuC6280PSG.cs" />
+    <Compile Include="Sound\IAsyncSoundProvider.cs" />
     <Compile Include="Sound\MMC5Audio.cs" />
     <Compile Include="Sound\SN76489.cs" />
+    <Compile Include="Sound\SoundMixer.cs" />
     <Compile Include="Sound\Sunsoft5BAudio.cs" />
     <Compile Include="Sound\VRC6Alt.cs" />
     <Compile Include="Sound\YM2413.cs" />

BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs

@@ -1,9 +1,8 @@
 using System;
-using System.IO;
-using System.Globalization;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components;
 
 namespace BizHawk.Emulation.Cores.PCEngine
 {

BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISoundProvider.cs

@@ -1,5 +1,4 @@
-using System;
-using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components;
 
 namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 {

BizHawk.Emulation.Cores/Sound/IAsyncSoundProvider.cs

@@ -1,25 +1,26 @@
 using System;
+using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Common
+namespace BizHawk.Emulation.Cores.Components
 {
 	/// <summary>
 	/// This interface is for legacy sound implementations in some older cores
 	/// This needs to go away, but is provided here, for now
 	/// </summary>
-	public interface IAsyncSoundProvider
+	internal interface IAsyncSoundProvider
 	{
 		void GetSamples(short[] samples);
 		void DiscardSamples();
 	}
 
 	/// <summary>
-	/// TODO: this is a shim for now
+	/// TODO: this is a shim for now, and needs to go away
 	/// turns an IAsyncSoundPRovider into a full ISoundProvider
 	/// This is used in cores that have an async only sound implementation
-	/// better is impleemnt a sync sound option in those cores without the need for 
+	/// better is implement a sync sound option in those cores without the need for 
 	/// this class or an IAsyncSoundPRovider interface
 	/// </summary>
-	public class FakeSyncSound : ISoundProvider
+	internal class FakeSyncSound : ISoundProvider
 	{
 		private readonly IAsyncSoundProvider source;
 		private readonly int spf;
@@ -75,4 +76,63 @@ namespace BizHawk.Emulation.Common
 			SyncMode = mode;
 		}
 	}
+
+	// An async sound provider
+	// This class needs to go away, it takes an IAsyncSoundProvider
+	// and is only used by legacy sound implementations
+	internal class MetaspuSoundProvider : ISoundProvider
+	{
+		public MetaspuSoundProvider(ESynchMethod method)
+		{
+			Buffer = Metaspu.metaspu_construct(method);
+		}
+
+		public ISynchronizingAudioBuffer Buffer { get; set; }
+		private readonly short[] pullBuffer = new short[1470];
+
+		public MetaspuSoundProvider()
+			: this(ESynchMethod.ESynchMethod_V)
+		{
+		}
+
+		public void PullSamples(IAsyncSoundProvider source)
+		{
+			Array.Clear(pullBuffer, 0, 1470);
+			source.GetSamples(pullBuffer);
+			Buffer.enqueue_samples(pullBuffer, 735);
+		}
+
+		public bool CanProvideAsync
+		{
+			get { return true; }
+		}
+
+		public SyncSoundMode SyncMode
+		{
+			get { return SyncSoundMode.Async; }
+		}
+
+		public void SetSyncMode(SyncSoundMode mode)
+		{
+			if (mode != SyncSoundMode.Async)
+			{
+				throw new NotSupportedException("Only Async mode is supported.");
+			}
+		}
+
+		public void GetSamplesSync(out short[] samples, out int nsamp)
+		{
+			throw new InvalidOperationException("Sync mode is not supported.");
+		}
+
+		public void GetSamplesAsync(short[] samples)
+		{
+			Buffer.output_samples(samples, samples.Length / 2);
+		}
+
+		public void DiscardSamples()
+		{
+			Buffer.clear();
+		}
+	}
 }

BizHawk.Emulation.Cores/Sound/SoundMixer.cs

@@ -1,17 +1,18 @@
 using System.Collections.Generic;
 
-namespace BizHawk.Emulation.Common
+namespace BizHawk.Emulation.Cores.Components
 {
+	// TODO: Sound mixer is a good concept, but it needs to be refactored to use an ISoundProvider, it perhaps can enforce only recieving providers in Async mode
 	/// <summary>
 	/// An interface that extends a sound provider to provide mixing capabilities through the SoundMixer class
 	/// </summary>
-	public interface IMixedSoundProvider : IAsyncSoundProvider
+	internal interface IMixedSoundProvider : IAsyncSoundProvider
 	{
 		int MaxVolume { get; set; }
 	}
 
 	// This is a straightforward class to mix/chain multiple ISoundProvider sources.
-	public sealed class SoundMixer : IAsyncSoundProvider
+	internal sealed class SoundMixer : IAsyncSoundProvider
 	{
 		private readonly List<IMixedSoundProvider> SoundProviders;
 

BizHawk.Emulation.Cores/Sound/YM2413.cs

@@ -7,6 +7,7 @@
 using System;
 
 using BizHawk.Common;
+using BizHawk.Emulation.Cores.Components;
 
 namespace BizHawk.Emulation.Common.Components
 {

BizHawk.Emulation.Cores/Sound/YM2612.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using BizHawk.Emulation.Cores.Components;
+
 namespace BizHawk.Emulation.Common.Components
 {
 	// ======================================================================