From e490c3c7f7bb5461cfa78a214827aa534fb43a3e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 21 Mar 2015 21:19:34 +0100 Subject: Bump OculusVR RIFT SDK to 0.4.4 --- LibOVR/Src/OVR_OSX_DeviceManager.h | 128 ------------------------------------- 1 file changed, 128 deletions(-) delete mode 100644 LibOVR/Src/OVR_OSX_DeviceManager.h (limited to 'LibOVR/Src/OVR_OSX_DeviceManager.h') diff --git a/LibOVR/Src/OVR_OSX_DeviceManager.h b/LibOVR/Src/OVR_OSX_DeviceManager.h deleted file mode 100644 index 61af848..0000000 --- a/LibOVR/Src/OVR_OSX_DeviceManager.h +++ /dev/null @@ -1,128 +0,0 @@ -/************************************************************************************ - -Filename : OVR_OSX_DeviceManager.h -Content : OSX specific DeviceManager header. -Created : March 14, 2013 -Authors : Lee Cooper - -Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved. - -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-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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -*************************************************************************************/ - -#ifndef OVR_OSX_DeviceManager_h -#define OVR_OSX_DeviceManager_h - -#include "OVR_DeviceImpl.h" - -#include "Kernel/OVR_Timer.h" - -#include -#include - -namespace OVR { namespace OSX { - -class DeviceManagerThread; - -//------------------------------------------------------------------------------------- -// ***** OSX DeviceManager - -class DeviceManager : public DeviceManagerImpl -{ -public: - DeviceManager(); - ~DeviceManager(); - - // Initialize/Shutdown manager thread. - virtual bool Initialize(DeviceBase* parent); - virtual void Shutdown(); - - virtual ThreadCommandQueue* GetThreadQueue(); - virtual ThreadId GetThreadId() const; - - virtual DeviceEnumerator<> EnumerateDevicesEx(const DeviceEnumerationArgs& args); - - virtual bool GetDeviceInfo(DeviceInfo* info) const; - -protected: - static void displayReconfigurationCallBack (CGDirectDisplayID display, - CGDisplayChangeSummaryFlags flags, - void *userInfo); - -public: // data - Ptr pThread; -}; - -//------------------------------------------------------------------------------------- -// ***** Device Manager Background Thread - -class DeviceManagerThread : public Thread, public ThreadCommandQueue -{ - friend class DeviceManager; - enum { ThreadStackSize = 32 * 1024 }; -public: - DeviceManagerThread(); - ~DeviceManagerThread(); - - virtual int Run(); - - // ThreadCommandQueue notifications for CommandEvent handling. - virtual void OnPushNonEmpty_Locked() - { - CFRunLoopSourceSignal(CommandQueueSource); - CFRunLoopWakeUp(RunLoop); - } - - virtual void OnPopEmpty_Locked() {} - - - // Notifier used for different updates (EVENT or regular timing or messages). - class Notifier - { - public: - - // Called when timing ticks are updated. // Returns the largest number of microseconds - // this function can wait till next call. - virtual double OnTicks(double tickSeconds) - { OVR_UNUSED1(tickSeconds); return 1000.0; } - }; - - // Add notifier that will be called at regular intervals. - bool AddTicksNotifier(Notifier* notify); - bool RemoveTicksNotifier(Notifier* notify); - - CFRunLoopRef GetRunLoop() - { return RunLoop; } - - void Shutdown(); -private: - CFRunLoopRef RunLoop; - - CFRunLoopSourceRef CommandQueueSource; - - static void staticCommandQueueSourceCallback(void* pContext); - void commandQueueSourceCallback(); - - Event StartupEvent; - - // Ticks notifiers. Used for time-dependent events such as keep-alive. - Array TicksNotifiers; -}; - -}} // namespace OSX::OVR - -#endif // OVR_OSX_DeviceManager_h -- cgit v1.2.3