From a25915855ab511a8277ed92ae0a0cbdcf1dc4c0d Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 18 Nov 2006 19:35:02 +0000 Subject: [PATCH] Update other arches. Not tested. --- stepmania/src/arch/Dialog/DialogDriver_Win32.cpp | 2 ++ stepmania/src/arch/Dialog/DialogDriver_Win32.h | 1 - stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_DirectInput.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp | 1 + stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h | 1 - stepmania/src/arch/InputHandler/InputHandler_X11.cpp | 2 ++ stepmania/src/arch/InputHandler/InputHandler_X11.h | 1 - stepmania/src/arch/InputHandler/InputHandler_Xbox.h | 2 ++ stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp | 2 ++ stepmania/src/arch/MovieTexture/MovieTexture_DShow.h | 1 - 19 files changed, 19 insertions(+), 9 deletions(-) diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp index 7818aa0855..ca8f0c42cb 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp @@ -22,6 +22,8 @@ int __stdcall AfxMessageBox(LPCTSTR lpszText, UINT nType, UINT nIDHelp); #endif +REGISTER_DIALOG_DRIVER_CLASS( Win32 ); + static bool g_bHush; static RString g_sMessage; static bool g_bAllowHush; diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.h b/stepmania/src/arch/Dialog/DialogDriver_Win32.h index 25e98019b1..bd61a152f7 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.h +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.h @@ -11,7 +11,6 @@ public: Dialog::Result AbortRetryIgnore( RString sMessage, RString sID ); Dialog::Result AbortRetry( RString sMessage, RString sID ); }; -#define USE_DIALOG_DRIVER_WIN32 #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp index 55fef7ad62..0037c170ac 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp @@ -14,6 +14,8 @@ #include "InputHandler_DirectInputHelper.h" +REGISTER_INPUT_HANDLER_CLASS( DirectInput ); + static vector Devices; /* Number of joysticks found: */ diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h index 1ba9e6b9c2..b0f401aa4f 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h +++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h @@ -34,7 +34,6 @@ private: void StartThread(); void ShutdownThread(); }; -#define USE_INPUT_HANDLER_DIRECTINPUT #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp index 9084198df4..8ef9841857 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp @@ -13,6 +13,8 @@ #include +REGISTER_INPUT_HANDLER_CLASS2( Joystick, InputHandler_Linux_Joystick ); + static const char *Paths[InputHandler_Linux_Joystick::NUM_JOYSTICKS] = { "/dev/js0", diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.h b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.h index bdb8da2633..10b646de12 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.h @@ -22,7 +22,6 @@ private: RageThread m_InputThread; bool m_bShutdown; }; -#define USE_INPUT_HANDLER_LINUX_JOYSTICK #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp index a82dcee151..6015813b73 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp @@ -22,6 +22,7 @@ #include #include +REGISTER_INPUT_HANDLER_CLASS2( tty, InputHandler_Linux_tty ); /* Map from keys (ignoring shifts) to SDLK values. */ static int keys[NR_KEYS]; diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h index 1f06c9347a..103e8d9c24 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h @@ -14,7 +14,6 @@ public: ~InputHandler_Linux_tty(); void GetDevicesAndDescriptions( vector& vDevicesOut ); }; -#define USE_INPUT_HANDLER_LINUX_TTY #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp index 6138a4f492..61a3358b62 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.cpp @@ -8,6 +8,8 @@ #pragma comment (lib,"winmm.lib") +REGISTER_INPUT_HANDLER_CLASS2( MIDI, InputHandler_Win32_MIDI ); + static HMIDIIN g_device; static void CALLBACK midiCallback(HMIDIIN g_device, UINT status, DWORD instancePtr, DWORD data, DWORD timestamp); diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h index f1e5d66757..1132fbc13c 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_MIDI.h @@ -17,7 +17,6 @@ public: private: bool m_bFoundDevice; }; -#define USE_INPUT_HANDLER_WIN32_MIDI #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp index 2526435cdf..d41b49897e 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.cpp @@ -13,6 +13,8 @@ extern "C" { #include "archutils/Win32/ddk/hidsdi.h" } +REGISTER_INPUT_HANDLER_CLASS( Para, InputHandler_Win32_Para ); + static void InitHack( HANDLE h ) { UCHAR hack[] = {0, 1}; diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h index c1d72c4ab3..19d7195074 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Para.h @@ -11,7 +11,6 @@ public: InputHandler_Win32_Para(); void GetDevicesAndDescriptions( vector& vDevicesOut ); }; -#define USE_INPUT_HANDLER_WIN32_PARA #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp index 41149df4ea..9423c4772d 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp @@ -8,6 +8,8 @@ #include "archutils/Win32/ErrorStrings.h" #include "archutils/Win32/USB.h" +REGISTER_INPUT_HANDLER_CLASS2( Pump, InputHandler_Win32_Pump ); + InputHandler_Win32_Pump::InputHandler_Win32_Pump() { m_bShutdown = false; diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h index 12bba6e57f..a04c93f00d 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h @@ -23,7 +23,6 @@ private: void InputThreadMain(); void HandleInput( int devno, int event ); }; -#define USE_INPUT_HANDLER_WIN32_PUMP #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_X11.cpp b/stepmania/src/arch/InputHandler/InputHandler_X11.cpp index ca969d7eb0..25fba5d9fa 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_X11.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_X11.cpp @@ -8,6 +8,8 @@ #include #include +REGISTER_INPUT_HANDLER_CLASS( X11 ); + static DeviceButton XSymToDeviceButton( int key ) { #define KEY_INV DeviceButton_Invalid diff --git a/stepmania/src/arch/InputHandler/InputHandler_X11.h b/stepmania/src/arch/InputHandler/InputHandler_X11.h index 4c5b54676b..bb53c4e4d7 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_X11.h +++ b/stepmania/src/arch/InputHandler/InputHandler_X11.h @@ -13,7 +13,6 @@ public: void Update(); void GetDevicesAndDescriptions( vector& vDevicesOut ); }; -#define USE_INPUT_HANDLER_X11 #endif diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h index 8b4e51f4db..d4ddf07dab 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h @@ -7,6 +7,8 @@ #define NUM_PORTS 4 +REGISTER_INPUT_HANDLER_CLASS( Xbox ); + class InputHandler_Xbox: public InputHandler { HANDLE joysticks[NUM_JOYSTICKS]; diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp index 4e8eec461f..d20706feec 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp @@ -29,6 +29,8 @@ #pragma comment(lib, "vfw32.lib") #endif +REGISTER_MOVIE_TEXTURE_CLASS( DShow ); + static RString FourCCToString( int fcc ) { char c[4]; diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h index 7b8a02106c..b155c175fd 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h +++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h @@ -70,7 +70,6 @@ private: bool m_bLoop; bool m_bPlaying; }; -#define USE_MOVIE_TEXTURE_DSHOW #endif