1.1 --- a/Hid/HidEvent.cs	Sun Mar 15 20:30:00 2015 +0100
     1.2 +++ b/Hid/HidEvent.cs	Sun Mar 15 20:44:15 2015 +0100
     1.3 @@ -52,7 +52,7 @@
     1.4      /// Represent a HID event.
     1.5      /// TODO: Rename this into HidRawInput?
     1.6      /// </summary>
     1.7 -    public class HidEvent : IDisposable
     1.8 +    public class Event : IDisposable
     1.9      {
    1.10          public bool IsValid { get; private set; }
    1.11          public bool IsForeground { get; private set; }
    1.12 @@ -68,7 +68,7 @@
    1.13          public bool IsRepeat { get { return RepeatCount != 0; } }
    1.14          public uint RepeatCount { get; private set; }
    1.15  
    1.16 -        public HidDevice Device { get; private set; }
    1.17 +        public Device Device { get; private set; }
    1.18          public RAWINPUT RawInput { get {return iRawInput;} } 
    1.19          private RAWINPUT iRawInput;
    1.20  
    1.21 @@ -83,7 +83,7 @@
    1.22          //TODO: We need a collection of input report
    1.23          public byte[] InputReport { get; private set; }
    1.24          //
    1.25 -        public delegate void HidEventRepeatDelegate(HidEvent aHidEvent);
    1.26 +        public delegate void HidEventRepeatDelegate(Event aHidEvent);
    1.27          public event HidEventRepeatDelegate OnHidEventRepeat;
    1.28  
    1.29          private System.Timers.Timer Timer { get; set; }
    1.30 @@ -115,7 +115,7 @@
    1.31          /// Initialize an HidEvent from a WM_INPUT message
    1.32          /// </summary>
    1.33          /// <param name="hRawInputDevice">Device Handle as provided by RAWINPUTHEADER.hDevice, typically accessed as rawinput.header.hDevice</param>
    1.34 -        public HidEvent(Message aMessage, HidEventRepeatDelegate aRepeatDelegate)
    1.35 +        public Event(Message aMessage, HidEventRepeatDelegate aRepeatDelegate)
    1.36          {
    1.37              RepeatCount = 0;
    1.38              IsValid = false;
    1.39 @@ -163,7 +163,7 @@
    1.40                  if (RawInput.header.hDevice != IntPtr.Zero)
    1.41                  {
    1.42                      //Get various information about this HID device
    1.43 -                    Device = new HidDevice(RawInput.header.hDevice);
    1.44 +                    Device = new Device(RawInput.header.hDevice);
    1.45                  }
    1.46  
    1.47                  if (RawInput.header.dwType == Win32.RawInputDeviceType.RIM_TYPEHID)  //Check that our raw input is HID                        
    1.48 @@ -406,7 +406,7 @@
    1.49              Timer.Enabled = true;
    1.50          }
    1.51  
    1.52 -        static private void OnRepeatTimerElapsed(object sender, ElapsedEventArgs e, HidEvent aHidEvent)
    1.53 +        static private void OnRepeatTimerElapsed(object sender, ElapsedEventArgs e, Event aHidEvent)
    1.54          {
    1.55              if (aHidEvent.IsStray)
    1.56              {