backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Implemented the Framework side of DynamicSoundEffectInstance (still needs native implementation)

Browse Source
This commit is contained in:
SND\AstrorEnales_cp 2012-09-30 08:28:17 +00:00 committed by Konstantin Koch
parent 3bf2261cd0
commit d4cce42aa8
12 changed files with 162 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ANX.Framework/ANX.Framework.csproj
View File

@ -445,6 +445,7 @@
<Compile Include="NonXNA\RenderSystem\INativeConstantBuffer.cs" />
<Compile Include="NonXNA\RenderSystem\IOcclusionQuery.cs" />
<Compile Include="NonXNA\RenderSystem\VertexTypeHelper.cs" />
<Compile Include="NonXNA\SoundSystem\IDynamicSoundEffectInstance.cs" />
<Compile Include="NonXNA\SoundSystem\IMicrophone.cs" />
<Compile Include="NonXNA\SoundSystem\ISong.cs" />
<Compile Include="NonXNA\ThreadHelper.cs" />

16
ANX.Framework/Audio/AudioEngine.cs
View File

@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using ANX.Framework.Audio.XactParser;
using ANX.Framework.NonXNA;
using ANX.Framework.NonXNA.Development;
using ANX.Framework.NonXNA.PlatformSystem;
@ -44,17 +43,12 @@ namespace ANX.Framework.Audio
#endregion
#region Constructor (TODO)
public AudioEngine(string settingsFile)
{
// TODO: get renderer details
RendererDetails = new ReadOnlyCollection<RendererDetail>(new List<RendererDetail>());
public AudioEngine(string settingsFile)
: this(settingsFile, TimeSpan.FromMilliseconds(250.0), String.Empty)
{
}
Stream loadingStream = PlatformSystem.Instance.OpenReadFilestream(settingsFile);
generalSettings = new XactGeneralSettings(loadingStream);
loadingStream.Dispose();
}
public AudioEngine(string settingsFile, TimeSpan lookAheadTime, string rendererId)
public AudioEngine(string settingsFile, TimeSpan lookAheadTime, string rendererId)
{
// TODO: get renderer details
RendererDetails = new ReadOnlyCollection<RendererDetail>(new List<RendererDetail>());

135
ANX.Framework/Audio/DynamicSoundEffectInstance.cs
View File

@ -1,5 +1,7 @@
using System;
using ANX.Framework.NonXNA;
using ANX.Framework.NonXNA.Development;
using ANX.Framework.NonXNA.SoundSystem;
// This file is part of the ANX.Framework created by the
// "ANX.Framework developer group" and released under the Ms-PL license.
@ -7,82 +9,75 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Audio
{
[PercentageComplete(0)]
public sealed class DynamicSoundEffectInstance : SoundEffectInstance
{
#region Events
public event EventHandler<EventArgs> BufferNeeded;
#endregion
[PercentageComplete(100)]
[TestState(TestStateAttribute.TestState.Untested)]
[Developer("AstrorEnales")]
public sealed class DynamicSoundEffectInstance : SoundEffectInstance
{
private IDynamicSoundEffectInstance nativeDynamicInstance;
private readonly AudioChannels channels;
private readonly int sampleRate;
#region Public
public override bool IsLooped
{
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
public event EventHandler<EventArgs> BufferNeeded;
public int PendingBufferCount
{
get
{
throw new NotImplementedException();
}
}
#endregion
#region Public
public int PendingBufferCount
{
get { return nativeDynamicInstance.PendingBufferCount; }
}
#endregion
#region Constructor
public DynamicSoundEffectInstance(int sampleRate, AudioChannels channels)
{
throw new NotImplementedException();
}
#endregion
#region Constructor
public DynamicSoundEffectInstance(int sampleRate, AudioChannels channels)
{
this.sampleRate = sampleRate;
this.channels = channels;
var creator = AddInSystemFactory.Instance.GetDefaultCreator<ISoundSystemCreator>();
nativeDynamicInstance = creator.CreateDynamicSoundEffectInstance();
nativeDynamicInstance.BufferNeeded += OnBufferNeeded;
SetNativeInstance(nativeDynamicInstance);
}
#endregion
#region GetSampleDuration
public TimeSpan GetSampleDuration(int sizeInBytes)
{
throw new NotImplementedException();
}
#endregion
private void OnBufferNeeded(object sender, EventArgs args)
{
BufferNeeded.Invoke(this, EventArgs.Empty);
}
#region GetSampleSizeInBytes
public int GetSampleSizeInBytes(TimeSpan duration)
{
throw new NotImplementedException();
}
#endregion
#region GetSampleDuration
public TimeSpan GetSampleDuration(int sizeInBytes)
{
float sizeMulBlockAlign = (float)sizeInBytes / ((int)channels * 2);
return TimeSpan.FromMilliseconds(sizeMulBlockAlign * 1000f / sampleRate);
}
#endregion
#region Play
public override void Play()
{
throw new NotImplementedException();
}
#endregion
#region GetSampleSizeInBytes
public int GetSampleSizeInBytes(TimeSpan duration)
{
int timeMulSamples = (int)(duration.TotalMilliseconds * (sampleRate / 1000f));
return (timeMulSamples + timeMulSamples % (int)channels) * ((int)channels * 2);
}
#endregion
public void SubmitBuffer(byte[] buffer)
{
nativeDynamicInstance.SubmitBuffer(buffer);
}
#region SubmitBuffer
public void SubmitBuffer(byte[] buffer)
{
throw new NotImplementedException();
}
#endregion
public void SubmitBuffer(byte[] buffer, int offset, int count)
{
nativeDynamicInstance.SubmitBuffer(buffer, offset, count);
}
#region SubmitBuffer
public void SubmitBuffer(byte[] buffer, int offset, int count)
{
throw new NotImplementedException();
}
#endregion
#region Dispose
protected override void Dispose(bool disposing)
{
throw new NotImplementedException();
}
#endregion
}
protected override void Dispose(bool disposing)
{
if (nativeDynamicInstance != null)
{
nativeDynamicInstance.BufferNeeded -= OnBufferNeeded;
}
nativeDynamicInstance = null;
base.Dispose(true);
}
}
}

28
ANX.Framework/Audio/RendererDetail.cs
View File

@ -16,22 +16,16 @@ namespace ANX.Framework.Audio
#endregion
#region Public
public string FriendlyName
{
get
{
return friendlyName;
}
}
public string FriendlyName
{
get { return friendlyName; }
}
public string RendererId
{
get
{
return rendererId;
}
}
#endregion
public string RendererId
{
get { return rendererId; }
}
#endregion
#region Constructor
internal RendererDetail(string setFriendlyName, string setRendererId)
@ -66,10 +60,8 @@ namespace ANX.Framework.Audio
#region Equality
public override bool Equals(object obj)
{
if (obj != null && obj is RendererDetail)
{
if (obj is RendererDetail)
return this == (RendererDetail)obj;
}
return false;
}

43
ANX.Framework/Audio/SoundEffectInstance.cs
View File

@ -15,7 +15,7 @@ namespace ANX.Framework.Audio
public class SoundEffectInstance : IDisposable
{
#region Private
private ISoundEffectInstance nativeInstance;
internal ISoundEffectInstance NativeInstance { get; private set; }
internal bool IsFireAndForget { get; private set; }
#endregion
@ -24,31 +24,31 @@ namespace ANX.Framework.Audio
public virtual bool IsLooped
{
get { return nativeInstance.IsLooped; }
set { nativeInstance.IsLooped = value; }
get { return NativeInstance.IsLooped; }
set { NativeInstance.IsLooped = value; }
}
public float Pan
{
get { return nativeInstance.Pan; }
set { nativeInstance.Pan = value; }
get { return NativeInstance.Pan; }
set { NativeInstance.Pan = value; }
}
public float Pitch
{
get { return nativeInstance.Pitch; }
set { nativeInstance.Pitch = value; }
get { return NativeInstance.Pitch; }
set { NativeInstance.Pitch = value; }
}
public SoundState State
{
get { return nativeInstance.State; }
get { return NativeInstance.State; }
}
public float Volume
{
get { return nativeInstance.Volume; }
set { nativeInstance.Volume = value; }
get { return NativeInstance.Volume; }
set { NativeInstance.Volume = value; }
}
#endregion
@ -60,7 +60,7 @@ namespace ANX.Framework.Audio
internal SoundEffectInstance(SoundEffect setParent, bool setIsFireAndForget)
{
IsFireAndForget = setIsFireAndForget;
nativeInstance = GetCreator().CreateSoundEffectInstance(setParent.NativeSoundEffect);
NativeInstance = GetCreator().CreateSoundEffectInstance(setParent.NativeSoundEffect);
}
~SoundEffectInstance()
@ -69,6 +69,11 @@ namespace ANX.Framework.Audio
}
#endregion
internal void SetNativeInstance(IDynamicSoundEffectInstance dynamicInstance)
{
NativeInstance = dynamicInstance;
}
#region GetCreator
private static ISoundSystemCreator GetCreator()
{
@ -84,28 +89,28 @@ namespace ANX.Framework.Audio
public void Apply3D(AudioListener[] listeners, AudioEmitter emitter)
{
nativeInstance.Apply3D(listeners, emitter);
NativeInstance.Apply3D(listeners, emitter);
}
#endregion
#region Pause
public void Pause()
{
nativeInstance.Pause();
NativeInstance.Pause();
}
#endregion
#region Play
public virtual void Play()
{
nativeInstance.Play();
NativeInstance.Play();
}
#endregion
#region Resume
public void Resume()
{
nativeInstance.Resume();
NativeInstance.Resume();
}
#endregion
@ -117,7 +122,7 @@ namespace ANX.Framework.Audio
public void Stop(bool immediate)
{
nativeInstance.Stop(immediate);
NativeInstance.Stop(immediate);
}
#endregion
@ -129,10 +134,10 @@ namespace ANX.Framework.Audio
protected virtual void Dispose(bool disposing)
{
if (nativeInstance != null)
if (NativeInstance != null)
{
nativeInstance.Dispose();
nativeInstance = null;
NativeInstance.Dispose();
NativeInstance = null;
}
IsDisposed = true;

14
ANX.Framework/Content/MediaTypeReaders/SoundEffectReader.cs
View File

@ -1,13 +1,13 @@
using System;
using ANX.Framework.Audio;
using System.IO;
using System.Runtime.InteropServices;
using ANX.Framework.Audio;
namespace ANX.Framework.Content
{
internal class SoundEffectReader : ContentTypeReader<SoundEffect>
{
private struct WAVEFORMATEX
private struct WaveFormatEx
{
public ushort wFormatTag;
public ushort nChannels;
@ -23,11 +23,11 @@ namespace ANX.Framework.Content
int formatCount = input.ReadInt32();
byte[] header = input.ReadBytes(formatCount);
WAVEFORMATEX headerStruct;
WaveFormatEx headerStruct;
unsafe
{
fixed(byte* ptr = &header[0])
headerStruct = (WAVEFORMATEX)Marshal.PtrToStructure((IntPtr)ptr, typeof(WAVEFORMATEX));
headerStruct = (WaveFormatEx)Marshal.PtrToStructure((IntPtr)ptr, typeof(WaveFormatEx));
}
int dataCount = input.ReadInt32();
@ -38,10 +38,10 @@ namespace ANX.Framework.Content
int duration = input.ReadInt32();
byte[] soundData = null;
using (MemoryStream mStream = new MemoryStream(20 + header.Length + 8 + data.Length))
byte[] soundData;
using (var mStream = new MemoryStream(20 + header.Length + 8 + data.Length))
{
BinaryWriter writer = new BinaryWriter(mStream);
var writer = new BinaryWriter(mStream);
writer.Write("RIFF".ToCharArray());
writer.Write(20 + header.Length + data.Length);
writer.Write("WAVE".ToCharArray());

17
ANX.Framework/NonXNA/SoundSystem/IDynamicSoundEffectInstance.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
// This file is part of the ANX.Framework created by the
// "ANX.Framework developer group" and released under the Ms-PL license.
// For details see: http://anxframework.codeplex.com/license
namespace ANX.Framework.NonXNA.SoundSystem
{
public interface IDynamicSoundEffectInstance : ISoundEffectInstance
{
event EventHandler<EventArgs> BufferNeeded;
int PendingBufferCount { get; }
void SubmitBuffer(byte[] buffer);
void SubmitBuffer(byte[] buffer, int offset, int count);
}
}

53
ANX.Framework/NonXNA/SoundSystem/ISoundEffectInstance.cs
View File

@ -7,45 +7,18 @@ using ANX.Framework.Audio;
namespace ANX.Framework.NonXNA.SoundSystem
{
public interface ISoundEffectInstance : IDisposable
{
bool IsLooped
{
get;
set;
}
public interface ISoundEffectInstance : IDisposable
{
bool IsLooped { get; set; }
float Pan { get; set; }
float Pitch { get; set; }
SoundState State { get; }
float Volume { get; set; }
float Pan
{
get;
set;
}
float Pitch
{
get;
set;
}
SoundState State
{
get;
}
float Volume
{
get;
set;
}
void Play();
void Pause();
void Stop(bool immediate);
void Resume();
void Apply3D(AudioListener[] listeners, AudioEmitter emitter);
}
void Play();
void Pause();
void Stop(bool immediate);
void Resume();
void Apply3D(AudioListener[] listeners, AudioEmitter emitter);
}
}

2
ANX.Framework/NonXNA/SoundSystem/ISoundSystemCreator.cs
View File

@ -36,5 +36,7 @@ namespace ANX.Framework.NonXNA.SoundSystem
int GetDefaultMicrophone(ReadOnlyCollection<Microphone> allMicrophones);
ISong CreateSong(Song parentSong, Uri uri);
IDynamicSoundEffectInstance CreateDynamicSoundEffectInstance();
}
}

6
SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs
View File

@ -160,6 +160,12 @@ namespace ANX.SoundSystem.OpenAL
#endregion
public ISong CreateSong(Song parentSong, Uri uri)
{
PreventSystemChange();
throw new NotImplementedException();
}
public IDynamicSoundEffectInstance CreateDynamicSoundEffectInstance()
{
PreventSystemChange();
throw new NotImplementedException();

6
SoundSystems/ANX.SoundSystem.PsVita/Creator.cs
View File

@ -171,5 +171,11 @@ namespace ANX.SoundSystem.PsVita
AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem);
throw new NotImplementedException();
}
public IDynamicSoundEffectInstance CreateDynamicSoundEffectInstance()
{
AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem);
throw new NotImplementedException();
}
}
}

6
SoundSystems/ANX.SoundSystem.Windows.XAudio/Creator.cs
View File

@ -154,6 +154,12 @@ namespace ANX.SoundSystem.Windows.XAudio
}
public ISong CreateSong(Song parentSong, Uri uri)
{
PreventSystemChange();
throw new NotImplementedException();
}
public IDynamicSoundEffectInstance CreateDynamicSoundEffectInstance()
{
PreventSystemChange();
throw new NotImplementedException();