This commit is contained in:
Glenn Maynard
2005-05-25 22:32:12 +00:00
parent f9192adc07
commit cef33517ee
5 changed files with 32 additions and 29 deletions
@@ -7,6 +7,14 @@
struct DIDevice;
class InputHandler_DInput: public InputHandler
{
public:
InputHandler_DInput();
~InputHandler_DInput();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
void Update(float fDeltaTime);
void WindowReset();
private:
RageThread InputThread;
bool shutdown;
@@ -19,13 +27,6 @@ class InputHandler_DInput: public InputHandler
void StartThread();
void ShutdownThread();
public:
InputHandler_DInput();
~InputHandler_DInput();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
void Update(float fDeltaTime);
void WindowReset();
};
#define USE_INPUT_HANDLER_DIRECTINPUT
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_MONKEY_SCRIPT
#define INPUT_HANDLER_MONKEY_SCRIPT 1
#define INPUT_HANDLER_MONKEY_SCRIPT
#include "InputHandler.h"
#include "RageTimer.h"
@@ -7,14 +7,15 @@
class InputHandler_MonkeyKeyboard: public InputHandler
{
RageTimer m_timerPressButton;
DeviceInput m_diLast; // Last input that we sent
public:
void Update(float fDeltaTime);
InputHandler_MonkeyKeyboard();
~InputHandler_MonkeyKeyboard();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
RageTimer m_timerPressButton;
DeviceInput m_diLast; // Last input that we sent
};
#define USE_INPUT_HANDLER_MONKEY_KEYBOARD
@@ -10,10 +10,11 @@ public:
InputHandler_Win32_MIDI();
~InputHandler_Win32_MIDI();
void Update(float fDeltaTime);
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
void Update( float fDeltaTime );
void GetDevicesAndDescriptions( vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut );
void SetDev( DeviceInput key, bool pressed ) { ButtonPressed( key, pressed ); }
private:
bool m_bFoundDevice;
};
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_WIN32_PARA_H
#define INPUT_HANDLER_WIN32_PARA_H 1
#define INPUT_HANDLER_WIN32_PARA_H
#include "InputHandler.h"
#include "RageThreads.h"
@@ -7,6 +7,13 @@
class USBDevice;
class InputHandler_Win32_Para: public InputHandler
{
public:
void Update(float fDeltaTime);
InputHandler_Win32_Para();
~InputHandler_Win32_Para();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
USBDevice *dev;
RageThread InputThread;
bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Para: public InputHandler
static int InputThread_Start( void *p );
void InputThreadMain();
void HandleInput( int devno, int event );
public:
void Update(float fDeltaTime);
InputHandler_Win32_Para();
~InputHandler_Win32_Para();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
};
#define USE_INPUT_HANDLER_WIN32_PARA
@@ -1,5 +1,5 @@
#ifndef INPUT_HANDLER_WIN32_PUMP_H
#define INPUT_HANDLER_WIN32_PUMP_H 1
#define INPUT_HANDLER_WIN32_PUMP_H
#include "InputHandler.h"
#include "RageThreads.h"
@@ -7,6 +7,13 @@
class USBDevice;
class InputHandler_Win32_Pump: public InputHandler
{
public:
void Update(float fDeltaTime);
InputHandler_Win32_Pump();
~InputHandler_Win32_Pump();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
private:
USBDevice *dev;
RageThread InputThread;
bool shutdown;
@@ -14,13 +21,6 @@ class InputHandler_Win32_Pump: public InputHandler
static int InputThread_Start( void *p );
void InputThreadMain();
void HandleInput( int devno, int event );
public:
void Update(float fDeltaTime);
InputHandler_Win32_Pump();
~InputHandler_Win32_Pump();
void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
};
#define USE_INPUT_HANDLER_WIN32_PUMP