Apple-2-Tools/Virtu
1
0
Fork 0
mirror of https://github.com/digital-jellyfish/Virtu.git synced 2024-11-27 00:49:39 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes.

Browse Source 
Modified Wpf PlatformTarget to x86.
Bumped version to 0.7 for next release.

--HG--
extra : convert_revision : svn%3Affd33b8c-2492-42e0-bdc5-587b920b7d6d/trunk%4034776
This commit is contained in:
Sean Fausett 2009-11-18 23:30:41 +00:00
parent 8382195feb
commit 8cb42c970d
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/DirectSound.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
@ -56,7 +55,6 @@ public void Stop()
_thread.Join(); _thread.Join();
} }
[SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Runtime.InteropServices.SafeHandle.DangerousGetHandle")]
private void Initialize() private void Initialize()
{ {
int hresult = NativeMethods.DirectSoundCreate(IntPtr.Zero, out _device, IntPtr.Zero); int hresult = NativeMethods.DirectSoundCreate(IntPtr.Zero, out _device, IntPtr.Zero);
@ -76,8 +74,7 @@ private void Initialize()
BufferPositionNotify[] positionEvents = new BufferPositionNotify[BlockCount] BufferPositionNotify[] positionEvents = new BufferPositionNotify[BlockCount]
{ {
new BufferPositionNotify(0 * _sampleSize, _position1Event.SafeWaitHandle.DangerousGetHandle()), new BufferPositionNotify(0 * _sampleSize, _position1Event), new BufferPositionNotify(1 * _sampleSize, _position2Event)
new BufferPositionNotify(1 * _sampleSize, _position2Event.SafeWaitHandle.DangerousGetHandle())
}; };
((IDirectSoundNotify)_buffer).SetNotificationPositions(positionEvents.Length, positionEvents); ((IDirectSoundNotify)_buffer).SetNotificationPositions(positionEvents.Length, positionEvents);
@ -170,7 +167,6 @@ private void Run() // com mta thread
public event EventHandler<DirectSoundUpdateEventArgs> Update; public event EventHandler<DirectSoundUpdateEventArgs> Update;
private const int BlockCount = 2; private const int BlockCount = 2;
private const int WaveFormatPcm = 1;
private int _sampleRate; private int _sampleRate;
private int _sampleChannels; private int _sampleChannels;

9
Library/DirectSoundInterop.cs
View File

@ -1,6 +1,8 @@
using System; using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security; using System.Security;
using System.Threading;
namespace Jellyfish.Library namespace Jellyfish.Library
{ {
@ -66,10 +68,11 @@ public BufferDescription(BufferCapabilities capabilities, int size, IntPtr forma
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
private struct BufferPositionNotify private struct BufferPositionNotify
{ {
public BufferPositionNotify(int offset, IntPtr notifyEvent) [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Runtime.InteropServices.SafeHandle.DangerousGetHandle")]
public BufferPositionNotify(int offset, EventWaitHandle notifyEvent)
{ {
dwOffset = offset; dwOffset = offset;
hEventNotify = notifyEvent; hEventNotify = notifyEvent.SafeWaitHandle.DangerousGetHandle();
} }
public int dwOffset; public int dwOffset;
@ -146,5 +149,7 @@ private static class NativeMethods
[DllImport("dsound.dll")] [DllImport("dsound.dll")]
public static extern int DirectSoundCreate(IntPtr pcGuidDevice, [MarshalAs(UnmanagedType.Interface)] out IDirectSound pDS, IntPtr pUnkOuter); public static extern int DirectSoundCreate(IntPtr pcGuidDevice, [MarshalAs(UnmanagedType.Interface)] out IDirectSound pDS, IntPtr pUnkOuter);
} }
private const int WaveFormatPcm = 1;
} }
} }

4
Virtu/Silverlight/Properties/AssemblyInfo.cs
View File

@ -11,8 +11,8 @@
[assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")] [assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")]
[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")] [assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
[assembly: AssemblyVersion("0.6.0.0")] [assembly: AssemblyVersion("0.7.0.0")]
[assembly: AssemblyFileVersion("0.6.0.0")] [assembly: AssemblyFileVersion("0.7.0.0")]
[assembly: CLSCompliant(false)] [assembly: CLSCompliant(false)]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
Virtu/Wpf/Jellyfish.Virtu.Wpf.csproj
View File

@ -29,6 +29,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn> <NoWarn>
</NoWarn> </NoWarn>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -40,6 +41,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn> <NoWarn>
</NoWarn> </NoWarn>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86" /> <Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86" />

4
Virtu/Wpf/Properties/AssemblyInfo.cs
View File

@ -12,8 +12,8 @@
[assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")] [assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")]
[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")] [assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
[assembly: AssemblyVersion("0.6.0.0")] [assembly: AssemblyVersion("0.7.0.0")]
[assembly: AssemblyFileVersion("0.6.0.0")] [assembly: AssemblyFileVersion("0.7.0.0")]
[assembly: CLSCompliant(false)] [assembly: CLSCompliant(false)]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
Virtu/Xna/Properties/AssemblyInfo.cs
View File

@ -15,9 +15,9 @@
[assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")] [assembly: AssemblyCopyright("Copyright © 1995-2009 Digital Jellyfish Design Ltd")]
[assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")] [assembly: AssemblyComment("Developed by Sean Fausett & Nick Westgate")]
[assembly: AssemblyVersion("0.6.0.0")] [assembly: AssemblyVersion("0.7.0.0")]
#if WINDOWS #if WINDOWS
[assembly: AssemblyFileVersion("0.6.0.0")] [assembly: AssemblyFileVersion("0.7.0.0")]
#endif #endif
[assembly: CLSCompliant(false)] [assembly: CLSCompliant(false)]