1.1 --- a/RemoteControlDevice.cs	Sat Dec 06 21:52:45 2014 +0100
     1.2 +++ b/RemoteControlDevice.cs	Sat Dec 06 22:59:55 2014 +0100
     1.3 @@ -187,31 +187,31 @@
     1.4  
     1.5              i++;
     1.6              rid[i].usUsagePage = (ushort)Hid.UsagePage.Consumer;
     1.7 -            rid[i].usUsage = (ushort)Hid.UsageIdConsumer.ConsumerControl;
     1.8 +            rid[i].usUsage = (ushort)Hid.UsageCollectionConsumer.ConsumerControl;
     1.9              rid[i].dwFlags = Const.RIDEV_EXINPUTSINK;
    1.10              rid[i].hwndTarget = aHWND;
    1.11  
    1.12              i++;
    1.13              rid[i].usUsagePage = (ushort)Hid.UsagePage.Consumer;
    1.14 -            rid[i].usUsage = (ushort)Hid.UsageIdConsumer.Selection;
    1.15 +            rid[i].usUsage = (ushort)Hid.UsageCollectionConsumer.Selection;
    1.16              rid[i].dwFlags = Const.RIDEV_EXINPUTSINK;
    1.17              rid[i].hwndTarget = aHWND;
    1.18  
    1.19              i++;
    1.20 -            rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControl;
    1.21 -            rid[i].usUsage = (ushort)Hid.UsageIdGenericDesktop.SystemControl;
    1.22 +            rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControls;
    1.23 +            rid[i].usUsage = (ushort)Hid.UsageCollectionGenericDesktop.SystemControl;
    1.24              rid[i].dwFlags = Const.RIDEV_EXINPUTSINK;
    1.25              rid[i].hwndTarget = aHWND;
    1.26  
    1.27              //i++;
    1.28 -            //rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControl;
    1.29 -            //rid[i].usUsage = (ushort)Hid.UsageIdGenericDesktop.Keyboard;
    1.30 +            //rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControls;
    1.31 +            //rid[i].usUsage = (ushort)Hid.UsageCollectionGenericDesktop.Keyboard;
    1.32              //rid[i].dwFlags = Const.RIDEV_EXINPUTSINK;
    1.33              //rid[i].hwndTarget = aHWND;
    1.34  
    1.35              //i++;
    1.36 -            //rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControl;
    1.37 -            //rid[i].usUsage = (ushort)Hid.UsageIdGenericDesktop.Mouse;
    1.38 +            //rid[i].usUsagePage = (ushort)Hid.UsagePage.GenericDesktopControls;
    1.39 +            //rid[i].usUsage = (ushort)Hid.UsageCollectionGenericDesktop.Mouse;
    1.40              //rid[i].dwFlags = Const.RIDEV_EXINPUTSINK;
    1.41              //rid[i].hwndTarget = aHWND;
    1.42  
    1.43 @@ -391,7 +391,7 @@
    1.44                  usagePageHandler = HidMceRemoteHandler;
    1.45              }
    1.46              //Check if this is a consumer control HID message
    1.47 -            else if (hidEvent.UsagePage == (ushort)Hid.UsagePage.Consumer && hidEvent.UsageCollection == (ushort)Hid.UsageIdConsumer.ConsumerControl)
    1.48 +            else if (hidEvent.UsagePage == (ushort)Hid.UsagePage.Consumer && hidEvent.UsageCollection == (ushort)Hid.UsageCollectionConsumer.ConsumerControl)
    1.49              {
    1.50                  usagePageHandler = HidConsumerDeviceHandler;
    1.51              }