libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-03-04 09:17:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2015-07-03 00:34:53 -04:00
parent 837a68b80f
commit df6bab3ee9
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/ui_win32/PH_DirectInput/InputManager.cpp
View File

@ -1,7 +1,7 @@
#include "InputManager.h"
#include "win32/GuidUtils.h"
#include <string.h>
#include <boost/lexical_cast.hpp>
#include "InputManager.h"
#include "win32/GuidUtils.h"
#define CONFIG_PREFIX ("input")
#define CONFIG_BINDING_TYPE ("bindingtype")
@ -235,7 +235,6 @@ std::tstring CInputManager::GetBindingDescription(PS2::CControllerInfo::BUTTON b
CInputManager::CSimpleBinding::CSimpleBinding(const GUID& device, uint32 id)
: m_binding(device, id)
, m_value(0)
{
}
@ -310,7 +309,6 @@ void CInputManager::CSimpleBinding::RegisterPreferences(Framework::CConfig& conf
CInputManager::CPovHatBinding::CPovHatBinding(const GUID& device, uint32 id, uint32 refValue)
: m_binding(device, id)
, m_refValue(refValue)
, m_value(0)
{
}

58
Source/ui_win32/PH_DirectInput/InputManager.h
View File

@ -1,5 +1,4 @@
#ifndef _PH_DI_INPUTMANAGER_H_
#define _PH_DI_INPUTMANAGER_H_
#pragma once
#include "directinput/Manager.h"
#include "tcharx.h"
@ -55,20 +54,20 @@ namespace PH_DirectInput
static void RegisterPreferences(Framework::CConfig&, const char*);
virtual BINDINGTYPE GetBindingType() const;
virtual BINDINGTYPE GetBindingType() const override;
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const;
virtual void ProcessEvent(const GUID&, uint32, uint32);
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const override;
virtual void ProcessEvent(const GUID&, uint32, uint32) override;
virtual uint32 GetValue() const;
virtual void SetValue(uint32);
virtual uint32 GetValue() const override;
virtual void SetValue(uint32) override;
virtual void Save(Framework::CConfig&, const char*) const;
virtual void Load(Framework::CConfig&, const char*);
virtual void Save(Framework::CConfig&, const char*) const override;
virtual void Load(Framework::CConfig&, const char*) override;
private:
BINDINGINFO m_binding;
uint32 m_value;
uint32 m_value = 0;
};
class CPovHatBinding : public CBinding
@ -79,23 +78,23 @@ namespace PH_DirectInput
static void RegisterPreferences(Framework::CConfig&, const char*);
virtual BINDINGTYPE GetBindingType() const;
virtual BINDINGTYPE GetBindingType() const override;
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const;
virtual void ProcessEvent(const GUID&, uint32, uint32);
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const override;
virtual void ProcessEvent(const GUID&, uint32, uint32) override;
virtual uint32 GetValue() const;
virtual void SetValue(uint32);
virtual uint32 GetValue() const override;
virtual void SetValue(uint32) override;
virtual void Save(Framework::CConfig&, const char*) const;
virtual void Load(Framework::CConfig&, const char*);
virtual void Save(Framework::CConfig&, const char*) const override;
virtual void Load(Framework::CConfig&, const char*) override;
private:
static int32 GetShortestDistanceBetweenAngles(int32, int32);
BINDINGINFO m_binding;
uint32 m_refValue;
uint32 m_value;
uint32 m_refValue = 0;
uint32 m_value = 0;
};
class CSimulatedAxisBinding : public CBinding
@ -106,23 +105,23 @@ namespace PH_DirectInput
static void RegisterPreferences(Framework::CConfig&, const char*);
virtual BINDINGTYPE GetBindingType() const;
virtual BINDINGTYPE GetBindingType() const override;
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const;
virtual void ProcessEvent(const GUID&, uint32, uint32);
virtual std::tstring GetDescription(Framework::DirectInput::CManager*) const override;
virtual void ProcessEvent(const GUID&, uint32, uint32) override;
virtual uint32 GetValue() const;
virtual void SetValue(uint32);
virtual uint32 GetValue() const override;
virtual void SetValue(uint32) override;
virtual void Save(Framework::CConfig&, const char*) const;
virtual void Load(Framework::CConfig&, const char*);
virtual void Save(Framework::CConfig&, const char*) const override;
virtual void Load(Framework::CConfig&, const char*) override;
private:
BINDINGINFO m_key1Binding;
BINDINGINFO m_key2Binding;
uint32 m_key1State;
uint32 m_key2State;
uint32 m_key1State = 0;
uint32 m_key2State = 0;
};
CInputManager(HWND, Framework::CConfig&);
@ -148,7 +147,6 @@ namespace PH_DirectInput
void OnInputEventReceived(const GUID&, uint32, uint32);
static void RegisterBindingPreference(Framework::CConfig&, const char*);
BindingPtr m_bindings[PS2::CControllerInfo::MAX_BUTTONS];
static uint32 m_buttonDefaultValue[PS2::CControllerInfo::MAX_BUTTONS];
@ -157,5 +155,3 @@ namespace PH_DirectInput
Framework::CConfig& m_config;
};
}
#endif