summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input/input_dinput.cpp
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2022-04-24 15:31:45 +1000
committer GitHub <noreply@github.com>2022-04-24 15:31:45 +1000
commit8614b890d377a45a765c2fab3b230512648f8b13 (patch)
tree1536d3e5c83500e5195a27d0545b4cd465a5cc9a /src/osd/modules/input/input_dinput.cpp
parent25c64006b7ca4bbb0d575b46c6c5c4f214dac7ed (diff)
osd/modules/input: Detect joystick reconnection with SDL. (#9605)
Also improved display name scheme for joystick axes and buttons.
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r--src/osd/modules/input/input_dinput.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index 8ceb29e21f4..7295b23de12 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -238,7 +238,7 @@ public:
result = dinput_set_dword_property(devinfo->dinput.device, DIPROP_AXISMODE, 0, DIPH_DEVICE, DIPROPAXISMODE_REL);
if (result != DI_OK && result != DI_PROPNOEFFECT)
{
- osd_printf_error("DirectInput: Unable to set relative mode for mouse %u (%s)\n", static_cast<unsigned int>(devicelist()->size()), devinfo->name());
+ osd_printf_error("DirectInput: Unable to set relative mode for mouse %u (%s)\n", static_cast<unsigned int>(devicelist().size()), devinfo->name());
goto error;
}
@@ -277,7 +277,7 @@ public:
error:
if (devinfo)
- devicelist()->free_device(*devinfo);
+ devicelist().free_device(*devinfo);
goto exit;
}
};
@@ -449,10 +449,10 @@ void dinput_joystick_device::poll()
int dinput_joystick_device::configure()
{
HRESULT result;
- auto devicelist = static_cast<input_module_base&>(module()).devicelist();
+ auto &devicelist = static_cast<input_module_base&>(module()).devicelist();
// temporary approximation of index
- int devindex = devicelist->size();
+ int devindex = devicelist.size();
// set absolute mode
result = dinput_set_dword_property(dinput.device, DIPROP_AXISMODE, 0, DIPH_DEVICE, DIPROPAXISMODE_ABS);