agate-svn-commit Mailing List for AgateLib (Page 16)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1162
          http://agate.svn.sourceforge.net/agate/?rev=1162&view=rev
Author:   kanato
Date:     2009-12-25 05:22:19 +0000 (Fri, 25 Dec 2009)

Log Message:
-----------
Update paths for output in release configurations.
Add SoundFormat enum.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/AudioLib/SoundBuffer.cs
    trunk/AgateLib/AudioLib/SoundBufferSession.cs
    trunk/AgateLib/Drivers/NullSoundImpl.cs
    trunk/AgateLib/ImplementationBase/AudioImpl.cs
    trunk/Drivers/AgateDrawing/AgateDrawing.csproj
    trunk/Drivers/AgateFMOD/FMOD_SoundBufferSession.cs
    trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
    trunk/Drivers/AgateOTK/AgateOTK.csproj
    trunk/Drivers/AgateSDL/AgateSDL.csproj
    trunk/Drivers/AgateSDL/Audio/SDL_Audio.cs
    trunk/Drivers/AgateSDL/Audio/SDL_SoundBuffer.cs
    trunk/Drivers/AgateSDL/Audio/SDL_SoundBufferSession.cs
    trunk/Drivers/AgateSDX/AgateSDX.csproj
    trunk/Drivers/AgateSDX/FrameBufferWindow.cs
    trunk/Drivers/AgateSDX/SDX_Audio.cs
    trunk/Tests/AudioTests/GenerateAudio.cs
    trunk/Tests/Tests.csproj

Added Paths:
-----------
    trunk/AgateLib/AudioLib/SoundFormat.cs

Modified: trunk/AgateLib/AgateLib.csproj
===================================================================

--- trunk/AgateLib/AgateLib.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/AgateLib/AgateLib.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -56,7 +56,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\Binaries\Release\AgateLib\</OutputPath>
+    <OutputPath>..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -132,6 +132,7 @@
     <Compile Include="AppInitParameters.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="AudioLib\SoundFormat.cs" />
     <Compile Include="Core.cs">
       <SubType>Code</SubType>
     </Compile>

Modified: trunk/AgateLib/AudioLib/SoundBuffer.cs
===================================================================
--- trunk/AgateLib/AudioLib/SoundBuffer.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/AgateLib/AudioLib/SoundBuffer.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -92,19 +92,14 @@
 		}
 
 		/// <summary>
-		/// Creates an empty SoundBuffer object.
+		/// Constructs a SoundBuffer object, loading audio data from the passed stream.
 		/// </summary>
-		/// <param name="size">The number of samples in this sound buffer.</param>
-		/// <param name="stereo"></param>
-		public SoundBuffer(int size)
+		/// <param name="source"></param>
+		public SoundBuffer(Stream source, SoundFormat format)
 		{
-			impl = Audio.Impl.CreateSoundBuffer(size);
+			impl = Audio.Impl.CreateSoundBuffer(source, format);
 		}
 
-		public SoundBuffer(short[] data)
-		{
-			impl = Audio.Impl.CreateSoundBuffer(data);
-		}
 		/// <summary>
 		/// Disposes of the SoundBuffer object, and all SoundBufferSession objects
 		/// created by this SoundBuffer.
@@ -275,11 +270,6 @@
 			mSessions.Remove(session);
 		}
 
-
-		public void Write(short[] source, int srcIndex, int destIndex, int length)
-		{
-			impl.Write(source, srcIndex, destIndex, length);
-		}
 	}
 
 }

Modified: trunk/AgateLib/AudioLib/SoundBufferSession.cs
===================================================================
--- trunk/AgateLib/AudioLib/SoundBufferSession.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/AgateLib/AudioLib/SoundBufferSession.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -57,6 +57,8 @@
 		{
 			Volume = mSource.Volume;
 			Pan = mSource.Pan;
+
+			impl.Initialize();
 		}
 
 		/// <summary>
@@ -125,6 +127,12 @@
 			get { return impl.Pan; }
 			set { impl.Pan = value; }
 		}
+
+		public int CurrentLocation
+		{
+			get { return impl.CurrentLocation; }
+		}
+
 		/// <summary>
 		/// Returns true if this Session is playing.
 		/// </summary>

Added: trunk/AgateLib/AudioLib/SoundFormat.cs
===================================================================
--- trunk/AgateLib/AudioLib/SoundFormat.cs	                        (rev 0)
+++ trunk/AgateLib/AudioLib/SoundFormat.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.AudioLib
+{
+	public enum SoundFormat
+	{
+		Raw16,
+		Wave,
+	}
+}

Modified: trunk/AgateLib/Drivers/NullSoundImpl.cs
===================================================================
--- trunk/AgateLib/Drivers/NullSoundImpl.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/AgateLib/Drivers/NullSoundImpl.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -83,6 +83,15 @@
 			{
 				get { return false; }
 			}
+
+			public override int CurrentLocation
+			{
+				get { return 0; }
+			}
+
+			protected internal override void Initialize()
+			{
+			}
 		}
 		public class NullMusicImpl : MusicImpl
 		{

Modified: trunk/AgateLib/ImplementationBase/AudioImpl.cs
===================================================================
--- trunk/AgateLib/ImplementationBase/AudioImpl.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/AgateLib/ImplementationBase/AudioImpl.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -73,6 +73,16 @@
 		public abstract SoundBufferImpl CreateSoundBuffer(Stream inStream);
 
 		/// <summary>
+		/// Creates a SoundBufferImpl object.
+		/// </summary>
+		/// <param name="inStream"></param>
+		/// <returns></returns>
+		public virtual SoundBufferImpl CreateSoundBuffer(Stream inStream, AudioLib.SoundFormat format)
+		{
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
 		/// This function is called once a frame to allow the Audio driver to update
 		/// information.  There is no need to call base.Update() if overriding this
 		/// function.
@@ -81,15 +91,6 @@
 		{
 		}
 
-		public virtual SoundBufferImpl CreateSoundBuffer(int size)
-		{
-			throw new NotImplementedException();
-		}
-
-		public virtual SoundBufferImpl CreateSoundBuffer(short[] data)
-		{
-			throw new NotImplementedException();
-		}
 	}
 
 	/// <summary>
@@ -112,12 +113,6 @@
 
 		public virtual bool Loop { get { return false; } set { } }
 
-		public virtual void Write(short[] source, int srcIndex, int destIndex, int length)
-		{
-			throw new NotImplementedException();
-		}
-
-
 	}
 	/// <summary>
 	/// Represents a playback instance.
@@ -139,13 +134,8 @@
 		/// </summary>
 		public abstract void Stop();
 
+		public abstract int CurrentLocation { get; }
 
-		public virtual int BufferPointer
-		{
-			get { return -1; }
-			set { }
-		}
-
 		/// <summary>
 		/// Gets or sets the volume this audio file is playing at.
 		/// 0.0 is completely quiet.
@@ -164,6 +154,11 @@
 		/// Gets whether or not this playback instance is actually playing.
 		/// </summary>
 		public abstract bool IsPlaying { get; }
+
+		/// <summary>
+		/// Initializes the SoundBufferSession to begin playing.
+		/// </summary>
+		protected internal abstract void Initialize();
 	}
 
 	/// <summary>

Modified: trunk/Drivers/AgateDrawing/AgateDrawing.csproj
===================================================================
--- trunk/Drivers/AgateDrawing/AgateDrawing.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateDrawing/AgateDrawing.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -57,7 +57,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\Release\Drivers\</OutputPath>
+    <OutputPath>..\..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

Modified: trunk/Drivers/AgateFMOD/FMOD_SoundBufferSession.cs
===================================================================
--- trunk/Drivers/AgateFMOD/FMOD_SoundBufferSession.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateFMOD/FMOD_SoundBufferSession.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -44,12 +44,13 @@
 			mSystem = mAudio.FMODSystem;
 			mSound = mBuffer.FMODSound;
 
-			//CheckCreateChannel();
-			CreateChannel();
-
 			Volume = mBuffer.Volume;
 		}
 
+		protected override void Initialize()
+		{
+			CreateChannel();
+		}
 		private void CheckFMODResult(FMOD.RESULT result)
 		{
 			if (result == FMOD.RESULT.ERR_INVALID_HANDLE)
@@ -141,5 +142,17 @@
 				return mAudio.IsChannelPlaying(mChannel);
 			}
 		}
+
+		public override int CurrentLocation
+		{
+			get
+			{
+				uint pos = 0;
+
+				mChannel.getPosition(ref pos, FMOD.TIMEUNIT.PCMBYTES);
+
+				return (int)pos / 2;
+			}
+		}
 	}
 }

Modified: trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj
===================================================================
--- trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateLib.WinForms/AgateLib.WinForms.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -56,7 +56,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\Release\AgateLib\</OutputPath>
+    <OutputPath>..\..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

Modified: trunk/Drivers/AgateOTK/AgateOTK.csproj
===================================================================
--- trunk/Drivers/AgateOTK/AgateOTK.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateOTK/AgateOTK.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -57,7 +57,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\Release\Drivers\</OutputPath>
+    <OutputPath>..\..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

Modified: trunk/Drivers/AgateSDL/AgateSDL.csproj
===================================================================
--- trunk/Drivers/AgateSDL/AgateSDL.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDL/AgateSDL.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -57,7 +57,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\Release\Drivers\</OutputPath>
+    <OutputPath>..\..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

Modified: trunk/Drivers/AgateSDL/Audio/SDL_Audio.cs
===================================================================
--- trunk/Drivers/AgateSDL/Audio/SDL_Audio.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDL/Audio/SDL_Audio.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -76,14 +76,6 @@
 		{
 			return new SDL_SoundBuffer(inStream);
 		}
-		public override SoundBufferImpl CreateSoundBuffer(int size)
-		{
-			return new SDL_SoundBuffer(size);
-		}
-		public override SoundBufferImpl CreateSoundBuffer(short[] data)
-		{
-			return new SDL_SoundBuffer(data);
-		}
 		public override SoundBufferSessionImpl CreateSoundBufferSession(SoundBufferImpl buffer)
 		{
 			return new SDL_SoundBufferSession((SDL_SoundBuffer)buffer);

Modified: trunk/Drivers/AgateSDL/Audio/SDL_SoundBuffer.cs
===================================================================
--- trunk/Drivers/AgateSDL/Audio/SDL_SoundBuffer.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDL/Audio/SDL_SoundBuffer.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -36,6 +36,7 @@
 		double mVolume = 1.0;
 		bool ownRam = false;
 		IntPtr soundPtr;
+		int samplesPerSec = 22050;
 
 		public SDL_SoundBuffer(Stream stream)
 		{
@@ -50,42 +51,16 @@
 		{
 			LoadFromFile(filename);
 		}
-		public SDL_SoundBuffer(int size)
-		{
-			int bytes = size * 2;
-			soundPtr = Marshal.AllocHGlobal(bytes);
-			ownRam = true;
 
-			sound = SdlMixer.Mix_QuickLoad_RAW(soundPtr, bytes);
-		}
-		public SDL_SoundBuffer(short[] data)
-		{
-			int bytes = data.Length * 2;
-			soundPtr = Marshal.AllocHGlobal(bytes);
-			ownRam = true;
 
-			Marshal.Copy(data, 0, soundPtr, data.Length);
-
-			sound = SdlMixer.Mix_QuickLoad_RAW(soundPtr, bytes);
-		}
-
-		public override void Write(short[] source, int srcIndex, int destIndex, int length)
+		~SDL_SoundBuffer()
 		{
-			if (soundPtr == IntPtr.Zero)
-				throw new AgateException("Cannot write to audio buffer loaded from a file.");
-
-			SdlMixer.Mix_Chunk c = 
-				(SdlMixer.Mix_Chunk)Marshal.PtrToStructure(sound, typeof(SdlMixer.Mix_Chunk));
-
-			unsafe
-			{
-				Marshal.Copy(source, srcIndex, (IntPtr)(((short*)c.abuf + destIndex)), length);
-			}
+			Dispose(false);
 		}
 
-		~SDL_SoundBuffer()
+		public int SamplePerSec
 		{
-			Dispose(false);
+			get { return samplesPerSec; }
 		}
 
 		public override void Dispose()

Modified: trunk/Drivers/AgateSDL/Audio/SDL_SoundBufferSession.cs
===================================================================
--- trunk/Drivers/AgateSDL/Audio/SDL_SoundBufferSession.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDL/Audio/SDL_SoundBufferSession.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -18,6 +18,7 @@
 //
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -35,21 +36,32 @@
 		double volume;
 		double pan;
 		bool loop;
+		Stopwatch watch = new Stopwatch();
+		SDL_SoundBuffer buffer;
 
 		public SDL_SoundBufferSession(SDL_SoundBuffer buffer)
 		{
+			this.buffer = buffer;
 			loop = buffer.Loop;
 
 			sound = buffer.SoundChunk;
 			channel = SdlMixer.Mix_PlayChannel(-1, sound, LoopCount);
 			volume = buffer.Volume;
 
+			watch.Reset();
+			watch.Start();
+
 		}
 		public override void Dispose()
 		{
 			Stop();
 		}
 
+		protected override void Initialize()
+		{
+			
+		}
+
 		public override bool IsPlaying
 		{
 			get { return SdlMixer.Mix_Playing(channel) != 0; }
@@ -68,6 +80,14 @@
 			}
 		}
 
+		public override int CurrentLocation
+		{
+			get
+			{
+				return (int)(watch.ElapsedMilliseconds / 1000.0 * buffer.SamplePerSec);
+			}
+		}
+
 		private void SetPanning()
 		{
 			byte leftVol = (byte)(pan <= 0 ? 255 : (int)((1.0 - pan) * 255));
@@ -80,6 +100,9 @@
 		{
 			SdlMixer.Mix_PlayChannel(channel, sound, LoopCount);
 			SetPanning();
+
+			watch.Reset();
+			watch.Start();
 		}
 
 		int LoopCount
@@ -97,6 +120,8 @@
 		public override void Stop()
 		{
 			SdlMixer.Mix_Pause(channel);
+
+			watch.Stop();
 		}
 
 		public override double Volume

Modified: trunk/Drivers/AgateSDX/AgateSDX.csproj
===================================================================
--- trunk/Drivers/AgateSDX/AgateSDX.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDX/AgateSDX.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -37,7 +37,7 @@
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
-    <OutputPath>..\..\Binaries\Debug\Drivers\</OutputPath>
+    <OutputPath>..\..\Binaries\Debug\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -57,7 +57,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\Release\Drivers\</OutputPath>
+    <OutputPath>..\..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

Modified: trunk/Drivers/AgateSDX/FrameBufferWindow.cs
===================================================================
--- trunk/Drivers/AgateSDX/FrameBufferWindow.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDX/FrameBufferWindow.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -31,8 +31,8 @@
 		public override void Dispose()
 		{
 			mSwap.Dispose();
-			mBackBuffer.Dispose();
-			mBackDepthStencil.Dispose();
+			//mBackBuffer.Dispose();
+			//mBackDepthStencil.Dispose();
 		}
 
 		public override Size Size

Modified: trunk/Drivers/AgateSDX/SDX_Audio.cs
===================================================================
--- trunk/Drivers/AgateSDX/SDX_Audio.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Drivers/AgateSDX/SDX_Audio.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -59,6 +59,11 @@
 		{
 			return new SDX_SoundBuffer(this, inStream);
 		}
+		public override SoundBufferImpl CreateSoundBuffer(Stream inStream, SoundFormat format)
+		{
+			return new SDX_SoundBuffer(this, inStream, format);
+		}
+
 		public override MusicImpl CreateMusic(System.IO.Stream musicStream)
 		{
 			CheckCoop();
@@ -105,6 +110,8 @@
 		AudioBuffer mBuffer;
 		double mVolume;
 		WaveFormat mFormat;
+		MemoryStream mem;
+		byte[] buffer;
 
 		public SDX_SoundBuffer(SDX_Audio audio, Stream inStream)
 		{
@@ -118,13 +125,51 @@
 			mBuffer.Flags = BufferFlags.EndOfStream;
 
 			mFormat = stream.Format;
+		}
 
+		public SDX_SoundBuffer(SDX_Audio audio, Stream inStream, SoundFormat format)
+		{
+			mAudio = audio;
+
+			switch (format)
+			{
+				case SoundFormat.Wave:
+					WaveStream stream = new WaveStream(inStream);
+
+					mBuffer = new AudioBuffer();
+					mBuffer.AudioData = stream;
+					mBuffer.AudioBytes = (int)inStream.Length;
+					mBuffer.Flags = BufferFlags.EndOfStream;
+
+					mFormat = stream.Format;
+					break;
+
+				case SoundFormat.Raw16:
+					mBuffer = new AudioBuffer();
+					mBuffer.AudioData = inStream;
+					mBuffer.AudioBytes = (int)inStream.Length;
+					mBuffer.Flags = BufferFlags.EndOfStream;
+
+					mFormat = new WaveFormat();
+					mFormat.BitsPerSample = 16;
+					mFormat.BlockAlignment = 2;
+					mFormat.Channels = 1;
+					mFormat.FormatTag = SlimDX.WaveFormatTag.Pcm;
+					mFormat.SamplesPerSecond = 44100;
+					mFormat.AverageBytesPerSecond =
+						mFormat.SamplesPerSecond * mFormat.BitsPerSample / 8;
+
+					break;
+			}
 		}
 		public SDX_SoundBuffer(SDX_Audio audio, string filename)
 			: this(audio, File.OpenRead(filename))
 		{
 
 		}
+
+		public override bool Loop { get; set; }
+
 		public override void Dispose()
 		{
 			mBuffer.Dispose();
@@ -147,6 +192,7 @@
 	}
 	public class SDX_SoundBufferSession : SoundBufferSessionImpl
 	{
+		SDX_SoundBuffer mSource;
 		SDX_Audio mAudio;
 		AudioBuffer mBuffer;
 		SourceVoice mVoice;
@@ -156,19 +202,36 @@
 		public SDX_SoundBufferSession(SDX_Audio audio, SDX_SoundBuffer source)
 		{
 			mAudio = audio;
+			mSource = source;
 			mBuffer = source.Buffer;
+			mVolume = source.Volume;
 
-			mVoice = new SourceVoice(mAudio.Device, source.Format);
-			mVoice.SubmitSourceBuffer(mBuffer);
-			mVoice.Start();
-
-			mVolume = source.Volume;
+			Initialize();
 		}
 		public override void Dispose()
 		{
 			mVoice.Dispose();
 		}
 
+		protected override void Initialize()
+		{
+			if (mVoice != null)
+			{
+				mVoice.Stop();
+				mVoice.Dispose();
+			}
+
+			mVoice = new SourceVoice(mAudio.Device, mSource.Format);
+			mVoice.SubmitSourceBuffer(mBuffer);
+		}
+
+		public override int CurrentLocation
+		{
+			get
+			{
+				return mVoice.State.SamplesPlayed;
+			}
+		}
 		public override void Play()
 		{
 			mVoice.Start();

Modified: trunk/Tests/AudioTests/GenerateAudio.cs
===================================================================
--- trunk/Tests/AudioTests/GenerateAudio.cs	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Tests/AudioTests/GenerateAudio.cs	2009-12-25 05:22:19 UTC (rev 1162)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using AgateLib;
@@ -37,9 +38,13 @@
 
 				int frequency = 100;
 				FillSoundBuffer(s, frequency);
+
+				byte[] buffer = new byte[s.Length * 2];
+				Buffer.BlockCopy(s, 0, buffer, 0, buffer.Length);
+
+				MemoryStream ms = new MemoryStream(buffer);
+				SoundBuffer buf = new SoundBuffer(ms, SoundFormat.Raw16);
 				
-				SoundBuffer buf = new SoundBuffer(s);
-				
 				buf.Loop = true;
 				
 				SoundBufferSession ses = buf.Play();
@@ -62,8 +67,10 @@
 					{
 						frequency += 50;
 						FillSoundBuffer(s, frequency);
-						buf.Write(s, 0, 0, s.Length);
+						Buffer.BlockCopy(s, 0, buffer, 0, buffer.Length);
 
+						ms.Seek(0, SeekOrigin.Begin);
+						buf.Play();
 						w.Reset();
 						w.Start();
 					}

Modified: trunk/Tests/Tests.csproj
===================================================================
--- trunk/Tests/Tests.csproj	2009-12-25 01:25:18 UTC (rev 1161)
+++ trunk/Tests/Tests.csproj	2009-12-25 05:22:19 UTC (rev 1162)
@@ -56,7 +56,7 @@
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\Binaries\Release\Tests\</OutputPath>
+    <OutputPath>..\Binaries\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan	Feb	Mar	Apr (86)	May (77)	Jun	Jul (1)	Aug (31)	Sep (12)	Oct (31)	Nov (53)	Dec (39)
2010	Jan (53)	Feb (14)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov (7)	Dec (13)
2011	Jan (17)	Feb (5)	Mar (1)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (10)	Nov (21)	Dec
2012	Jan (6)	Feb (14)	Mar (5)	Apr (4)	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan (1)	Feb (8)	Mar (1)	Apr	May	Jun	Jul	Aug (2)	Sep (1)	Oct (5)	Nov (9)	Dec (5)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (3)	May	Jun (5)	Jul (33)	Aug (69)	Sep (35)	Oct (4)	Nov (1)	Dec

agate-svn-commit Mailing List for AgateLib (Page 16)

agate-svn-commit — List with automated subversion commit messages.