summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-27 08:13:59 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-27 08:13:59 +0200
commitcfee536f22f032c7ead65075f73cc6fd8549e68b (patch)
treef4b4703dd0295571684456c19668f508b3ddcb3a /src/osd/modules/input
parentbe8159d01eaa7533e7758bf07384501dbc6214f3 (diff)
Cleanups and version bumpmame0173
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r--src/osd/modules/input/input_dinput.cpp6
-rw-r--r--src/osd/modules/input/input_dinput.h2
-rw-r--r--src/osd/modules/input/input_sdl.cpp12
-rw-r--r--src/osd/modules/input/input_sdlcommon.h2
-rw-r--r--src/osd/modules/input/input_winhybrid.cpp8
-rw-r--r--src/osd/modules/input/input_xinput.cpp2
-rw-r--r--src/osd/modules/input/input_xinput.h2
7 files changed, 17 insertions, 17 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index 5aa925edefe..d8400a8346c 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -128,8 +128,8 @@ void dinput_keyboard_device::reset()
dinput_api_helper::dinput_api_helper(int version)
: m_dinput(nullptr),
- m_dinput_version(version),
- m_pfn_DirectInputCreate("DirectInputCreateW", L"dinput.dll")
+ m_dinput_version(version),
+ m_pfn_DirectInputCreate("DirectInputCreateW", L"dinput.dll")
{
}
@@ -200,7 +200,7 @@ protected:
public:
dinput_module(const char* type, const char* name)
: wininput_module(type, name),
- m_dinput_helper(nullptr)
+ m_dinput_helper(nullptr)
{
}
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index f06520cb285..3d3cf7e6544 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -23,7 +23,7 @@ public:
struct dinput_callback_context
{
device_enum_interface * self;
- void * state;
+ void * state;
};
virtual ~device_enum_interface()
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index f91d083371d..50ddf09cf33 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -702,24 +702,24 @@ public:
: sdl_input_module(OSD_JOYSTICKINPUT_PROVIDER), m_sixaxis_mode(false)
{
}
-
+
virtual void exit() override
{
sdl_input_module::exit();
-
+
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
- }
-
+ }
+
virtual void input_init(running_machine &machine) override
{
- SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+ SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK))
{
osd_printf_error("Could not initialize SDL Joystick: %s.\n", SDL_GetError());
return;
}
-
+
sdl_input_module::input_init(machine);
char tempname[512];
diff --git a/src/osd/modules/input/input_sdlcommon.h b/src/osd/modules/input/input_sdlcommon.h
index abdc4ddf4ed..cfc5a647793 100644
--- a/src/osd/modules/input/input_sdlcommon.h
+++ b/src/osd/modules/input/input_sdlcommon.h
@@ -63,7 +63,7 @@ class sdl_event_subscriber
{
public:
virtual ~sdl_event_subscriber() {}
- virtual void handle_event(SDL_Event &sdlevent) = 0;
+ virtual void handle_event(SDL_Event &sdlevent) = 0;
};
template <class TSubscriber>
diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp
index 22534b75453..60418f2f023 100644
--- a/src/osd/modules/input/input_winhybrid.cpp
+++ b/src/osd/modules/input/input_winhybrid.cpp
@@ -275,10 +275,10 @@ private:
}
//-----------------------------------------------------------------------------
- // Enum each PNP device using WMI and check each device ID to see if it contains
+ // Enum each PNP device using WMI and check each device ID to see if it contains
// "IG_" (ex. "VID_045E&PID_028E&IG_00"). If it does, then it's an XInput device
// Unfortunately this information can not be found by just using DirectInput.
- // Checking against a VID/PID of 0x028E/0x045E won't find 3rd party or future
+ // Checking against a VID/PID of 0x028E/0x045E won't find 3rd party or future
// XInput devices.
//-----------------------------------------------------------------------------
HRESULT get_xinput_devices(std::list<DWORD> &xinput_id_list) const
@@ -317,7 +317,7 @@ private:
bstrDeviceID = bstr_ptr(SysAllocString(L"DeviceID"));
bstrClassName = bstr_ptr(SysAllocString(L"Win32_PNPEntity"));
- // Connect to WMI
+ // Connect to WMI
hr = pIWbemLocator->ConnectServer(
bstrNamespace.get(),
nullptr,
@@ -377,7 +377,7 @@ private:
if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != nullptr)
{
// Check if the device ID contains "IG_". If it does, then it's an XInput device
- // Unfortunately this information can not be found by just using DirectInput
+ // Unfortunately this information can not be found by just using DirectInput
if (wcsstr(var.bstrVal, L"IG_"))
{
// If it does, then get the VID/PID from var.bstrVal
diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp
index c3725ffbf08..9226011c273 100644
--- a/src/osd/modules/input/input_xinput.cpp
+++ b/src/osd/modules/input/input_xinput.cpp
@@ -115,7 +115,7 @@ xinput_joystick_device::xinput_joystick_device(running_machine &machine, const c
gamepad({{0}}),
xinput_state({0}),
m_xinput_helper(helper),
- m_configured(false)
+ m_configured(false)
{
}
diff --git a/src/osd/modules/input/input_xinput.h b/src/osd/modules/input/input_xinput.h
index 4474a3f58f7..791fc36f310 100644
--- a/src/osd/modules/input/input_xinput.h
+++ b/src/osd/modules/input/input_xinput.h
@@ -131,7 +131,7 @@ private:
public:
xinput_joystick_device(running_machine &machine, const char *name, input_module &module, std::shared_ptr<xinput_api_helper> helper);
-
+
void poll() override;
void reset() override;
void configure();