ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apple make noises

This commit is contained in:
goyuken 2015-04-04 00:43:35 +00:00
parent 3bf2d8f00b
commit d4bf5c40a2
3 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IEmulator.cs
View File

@ -9,19 +9,19 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
[FeatureNotImplemented]
public ISoundProvider SoundProvider
{
get { return NullSound.SilenceProvider; }
get { return null; }
}
[FeatureNotImplemented]
public ISyncSoundProvider SyncSoundProvider
{
get { return new FakeSyncSound(NullSound.SilenceProvider, 735); }
get { return _soundService; }
}
[FeatureNotImplemented]
public bool StartAsyncSound()
{
return true;
return false;
}
[FeatureNotImplemented]

12
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -90,20 +90,10 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
public BizAudioService(Machine _machine) : base(_machine) { }
public override void SetVolume(float volume)
{
}
public void GetSamples(out short[] samples, out int nsamp)
{
samples = Array.ConvertAll(Source, b => (short)b); // TODO: is it really 8 bit?
nsamp = Source.Length;
}
public void DiscardSamples()
{
//TODO
//Source.DiscardSamples();
Reset();
}
}

54
BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/AudioService.cs
View File

@ -14,53 +14,31 @@ namespace Jellyfish.Virtu.Services
public void Output(int data) // machine thread
{
if (BitConverter.IsLittleEndian)
{
_buffer[_index + 0] = (byte)(data & 0xFF);
_buffer[_index + 1] = (byte)(data >> 8);
}
else
{
_buffer[_index + 0] = (byte)(data >> 8);
_buffer[_index + 1] = (byte)(data & 0xFF);
}
_index = (_index + 2) % SampleSize;
if (_index == 0)
{
if (Machine.Cpu.IsThrottled)
{
_writeEvent.WaitOne(SampleLatency * 2); // allow timeout; avoids deadlock
}
}
if (pos < buff.Length - 2)
{
buff[pos++] = (short)data;
buff[pos++] = (short)data;
}
}
private short[] buff = new short[4096];
private int pos = 0;
public void Reset()
{
Buffer.BlockCopy(SampleZero, 0, _buffer, 0, SampleSize);
pos = 0;
}
public abstract void SetVolume(float volume);
protected void Update() // audio thread
{
_writeEvent.Set();
}
public const int SampleRate = 44100; // hz
public const int SampleChannels = 1;
public const int SampleBits = 16;
public const int SampleLatency = 40; // ms
public const int SampleSize = (SampleRate * SampleLatency / 1000) * SampleChannels * (SampleBits / 8);
public void GetSamples(out short[] samples, out int nsamp)
{
samples = buff;
nsamp = pos / 2;
pos = 0;
[SuppressMessage("Microsoft.Security", "CA2105:ArrayFieldsShouldNotBeReadOnly")]
protected static readonly byte[] SampleZero = new byte[SampleSize];
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
protected byte[] Source { get { return _buffer; } }
private byte[] _buffer = new byte[SampleSize];
private int _index;
private AutoResetEvent _writeEvent = new AutoResetEvent(false);
Console.WriteLine(nsamp);
}
}
}