Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo some changes.

Browse Source
This commit is contained in:
Florian Küpper committed 2013-08-25 15:19:18 +02:00
1 parent 8e524b6f48
commit 56d4e84cfe
1 file changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Lib/Input/CHIDAPI.cs
+6 -8
View File
@@ -28,14 +28,14 @@ namespace Vocaluxe.Lib.Input
{ {
// ReSharper disable MemberCanBePrivate.Global // ReSharper disable MemberCanBePrivate.Global
[MarshalAs(UnmanagedType.LPTStr)] public readonly String Path; [MarshalAs(UnmanagedType.LPTStr)] public readonly String Path;
[MarshalAs(UnmanagedType.LPWStr)] public readonly ushort VendorString; public readonly ushort VendorString;
[MarshalAs(UnmanagedType.LPWStr)] public readonly ushort ProductID; public readonly ushort ProductID;
[MarshalAs(UnmanagedType.LPWStr)] public readonly String SerialNumber; [MarshalAs(UnmanagedType.LPWStr)] public readonly String SerialNumber;
[MarshalAs(UnmanagedType.LPWStr)] public readonly ushort ReleaseNumber; public readonly ushort ReleaseNumber;
[MarshalAs(UnmanagedType.LPWStr)] public readonly String ManufacturerString; [MarshalAs(UnmanagedType.LPWStr)] public readonly String ManufacturerString;
[MarshalAs(UnmanagedType.LPWStr)] public readonly String ProductString; [MarshalAs(UnmanagedType.LPWStr)] public readonly String ProductString;
[MarshalAs(UnmanagedType.LPWStr)] public readonly ushort UsagePage; public readonly ushort UsagePage;
[MarshalAs(UnmanagedType.LPWStr)] public readonly ushort Usage; public readonly ushort Usage;
[MarshalAs(UnmanagedType.LPWStr)] public readonly int InterfaceNumber; [MarshalAs(UnmanagedType.LPWStr)] public readonly int InterfaceNumber;
internal IntPtr Next; internal IntPtr Next;
// ReSharper restore MemberCanBePrivate.Global // ReSharper restore MemberCanBePrivate.Global
@@ -62,14 +62,11 @@ namespace Vocaluxe.Lib.Input
private const string _HIDApiDll = "libhidapi.so"; private const string _HIDApiDll = "libhidapi.so";
#endif #endif
#endif #endif
private static IntPtr dataPtr;
[DllImport(_HIDApiDll, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl, EntryPoint = "hid_init", CharSet = CharSet.Unicode)] [DllImport(_HIDApiDll, ExactSpelling = false, CallingConvention = CallingConvention.Cdecl, EntryPoint = "hid_init", CharSet = CharSet.Unicode)]
private static extern int hid_init(); private static extern int hid_init();
public static bool Init() public static bool Init()
{ {
dataPtr = Marshal.AllocCoTaskMem(22);
int result; int result;
try try
{ {
@@ -164,6 +161,7 @@ namespace Vocaluxe.Lib.Input
public static int ReadTimeout(IntPtr device, ref byte[] data, int length, int milliseconds) public static int ReadTimeout(IntPtr device, ref byte[] data, int length, int milliseconds)
{ {
IntPtr dataPtr = Marshal.AllocHGlobal(length);
int result; int result;
try try
{ {