diff options
| author | Brad Davis <[email protected]> | 2014-04-14 21:25:09 -0700 |
|---|---|---|
| committer | Brad Davis <[email protected]> | 2014-04-14 21:25:09 -0700 |
| commit | 07d0f4d0bbf3477ac6a9584f726e8ec6ab285707 (patch) | |
| tree | 1854d0c690eff32e77b137567c88a52d56d8b660 /LibOVR/Src/OVR_Win32_DeviceStatus.cpp | |
| parent | f28388ff2af14b56ef2d973b2f4f9da021716d4c (diff) | |
Adding windows 0.3.1 SDK
Diffstat (limited to 'LibOVR/Src/OVR_Win32_DeviceStatus.cpp')
| -rw-r--r-- | LibOVR/Src/OVR_Win32_DeviceStatus.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/LibOVR/Src/OVR_Win32_DeviceStatus.cpp b/LibOVR/Src/OVR_Win32_DeviceStatus.cpp index 96655a5..22f193c 100644 --- a/LibOVR/Src/OVR_Win32_DeviceStatus.cpp +++ b/LibOVR/Src/OVR_Win32_DeviceStatus.cpp @@ -5,16 +5,16 @@ Content : Win32 implementation of DeviceStatus. Created : January 24, 2013 Authors : Lee Cooper -Copyright : Copyright 2013 Oculus VR, Inc. All Rights reserved. +Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. -Licensed under the Oculus VR SDK License Version 2.0 (the "License"); -you may not use the Oculus VR SDK except in compliance with the License, +Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); +you may not use the Oculus VR Rift SDK except in compliance with the License, which is provided at the time of installation or download, or which otherwise accompanies this software in either electronic or hard copy form. You may obtain a copy of the License at -http://www.oculusvr.com/licenses/LICENSE-2.0 +http://www.oculusvr.com/licenses/LICENSE-3.1 Unless required by applicable law or agreed to in writing, the Oculus VR SDK distributed under the License is distributed on an "AS IS" BASIS, @@ -36,6 +36,10 @@ namespace OVR { namespace Win32 { static TCHAR windowClassName[] = TEXT("LibOVR_DeviceStatus_WindowClass"); +#define STATIC_KSCATEGORY_VIDEO_CAMERA \ + 0xe5323777, 0xf976, 0x4f5b, { 0x9b, 0x55, 0xb9, 0x46, 0x99, 0xc4, 0x6e, 0x44 } + + //------------------------------------------------------------------------------------- DeviceStatus::DeviceStatus(Notifier* const pClient) : pNotificationClient(pClient), LastTimerId(0) @@ -259,8 +263,10 @@ LRESULT CALLBACK DeviceStatus::WindowsMessageCallback( HWND hwnd, DeviceStatus* pDeviceStatus = (DeviceStatus*) userData; String devicePath(hdr->dbcc_name); + static const GUID videoCamGuid = { STATIC_KSCATEGORY_VIDEO_CAMERA }; // check if HID device caused the event... - if (pDeviceStatus->HidGuid == hdr->dbcc_classguid) + if (pDeviceStatus->HidGuid == hdr->dbcc_classguid || + videoCamGuid == hdr->dbcc_classguid) { // check if recovery timer is already running; stop it and // remove it, if so. |