mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix narrow warning in ds4_pad_handler.cpp

Browse Source
This commit is contained in:
Nekotekina 2020-03-10 18:43:50 +03:00
parent 1678b37aa0
commit b4f416cb76
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcs3/Input/ds4_pad_handler.cpp
View File

@ -535,8 +535,9 @@ void ds4_pad_handler::CheckAddDevice(hid_device* hidDevice, hid_device_info* hid
else else
{ {
ds4Dev->btCon = true; ds4Dev->btCon = true;
std::wstring wSerial(hidDevInfo->serial_number); std::wstring_view wideSerial(hidDevInfo->serial_number);
serial = std::string(wSerial.begin(), wSerial.end()); for (wchar_t ch : wideSerial)
serial += static_cast<uchar>(ch);
} }
if (!GetCalibrationData(ds4Dev)) if (!GetCalibrationData(ds4Dev))
@ -951,10 +952,10 @@ void ds4_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, c
} }
// Use LEDs to indicate battery level // Use LEDs to indicate battery level
if (ds4_dev->config->led_battery_indicator) if (ds4_dev->config->led_battery_indicator)
{ {
// This makes sure that the LED color doesn't update every 1ms. DS4 only reports battery level in 10% increments // This makes sure that the LED color doesn't update every 1ms. DS4 only reports battery level in 10% increments
if (ds4_dev->last_battery_level != ds4_dev->batteryLevel) if (ds4_dev->last_battery_level != ds4_dev->batteryLevel)
{ {
const u32 combined_color = get_battery_color(ds4_dev->batteryLevel, ds4_dev->config->led_battery_indicator_brightness); const u32 combined_color = get_battery_color(ds4_dev->batteryLevel, ds4_dev->config->led_battery_indicator_brightness);
ds4_dev->config->colorR.set(combined_color >> 8); ds4_dev->config->colorR.set(combined_color >> 8);