From e308f7e6ea36789fac754edfddf528eea5b6ae6d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 19 Sep 2005 04:51:49 +0000 Subject: [PATCH] cleanup --- stepmania/src/InputFilter.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h index 7bd46727ea..4f9502ee11 100644 --- a/stepmania/src/InputFilter.h +++ b/stepmania/src/InputFilter.h @@ -40,19 +40,6 @@ typedef vector InputEventArray; class RageMutex; class InputFilter { - struct ButtonState - { - ButtonState() { m_BeingHeld = false; m_fSecsHeld = m_Level = m_LastLevel = 0; } - bool m_BeingHeld; - CString m_sComment; - float m_fSecsHeld; - float m_Level, m_LastLevel; - }; - ButtonState m_ButtonState[NUM_INPUT_DEVICES][MAX_DEVICE_BUTTONS]; - - InputEventArray queue; - RageMutex *queuemutex; - public: void ButtonPressed( DeviceInput di, bool Down ); void SetButtonComment( DeviceInput di, const CString &sComment = "" ); @@ -72,6 +59,20 @@ public: CString GetButtonComment( DeviceInput di ) const; void GetInputEvents( InputEventArray &array ); + +private: + struct ButtonState + { + ButtonState() { m_BeingHeld = false; m_fSecsHeld = m_Level = m_LastLevel = 0; } + bool m_BeingHeld; + CString m_sComment; + float m_fSecsHeld; + float m_Level, m_LastLevel; + }; + ButtonState m_ButtonState[NUM_INPUT_DEVICES][MAX_DEVICE_BUTTONS]; + + InputEventArray queue; + RageMutex *queuemutex; };