1.1 --- a/Hid/HidHandler.cs	Sun Mar 15 20:30:00 2015 +0100
     1.2 +++ b/Hid/HidHandler.cs	Sun Mar 15 20:44:15 2015 +0100
     1.3 @@ -33,18 +33,18 @@
     1.4      /// <summary>
     1.5      /// Our HID handler manages raw input registrations, processes WM_INPUT messages and broadcasts HID events in return.
     1.6      /// </summary>
     1.7 -    public class HidHandler
     1.8 +    public class Handler
     1.9      {
    1.10 -        public delegate void HidEventHandler(object aSender, HidEvent aHidEvent);
    1.11 +        public delegate void HidEventHandler(object aSender, Event aHidEvent);
    1.12          public event HidEventHandler OnHidEvent;
    1.13 -        List<HidEvent> iHidEvents;
    1.14 +        List<Event> iHidEvents;
    1.15  
    1.16  
    1.17          public bool IsRegistered { get; private set; }
    1.18  
    1.19 -        public HidHandler(RAWINPUTDEVICE[] aRawInputDevices)
    1.20 +        public Handler(RAWINPUTDEVICE[] aRawInputDevices)
    1.21          {
    1.22 -            iHidEvents=new List<HidEvent>();
    1.23 +            iHidEvents=new List<Event>();
    1.24              IsRegistered = Function.RegisterRawInputDevices(aRawInputDevices, (uint)aRawInputDevices.Length, (uint)Marshal.SizeOf(aRawInputDevices[0]));
    1.25          }
    1.26  
    1.27 @@ -60,7 +60,7 @@
    1.28                  return;
    1.29              }
    1.30  
    1.31 -            HidEvent hidEvent = new HidEvent(aMessage, OnHidEventRepeat);
    1.32 +            Event hidEvent = new Event(aMessage, OnHidEventRepeat);
    1.33              hidEvent.DebugWrite();
    1.34  
    1.35              if (!hidEvent.IsValid || !hidEvent.IsGeneric)
    1.36 @@ -93,7 +93,7 @@
    1.37              OnHidEvent(this, hidEvent);    
    1.38          }
    1.39  
    1.40 -        public void OnHidEventRepeat(HidEvent aHidEvent)
    1.41 +        public void OnHidEventRepeat(Event aHidEvent)
    1.42          {
    1.43              //Broadcast our events
    1.44              OnHidEvent(this, aHidEvent);