mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-02-28 12:16:06 -05:00
Move wstring to string conversion to StringUtils.cpp and update most HID get serial number functions to use it
This commit is contained in:
@@ -11,25 +11,13 @@
|
||||
|
||||
#include <string.h>
|
||||
#include "InstantMouseController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
InstantMouseController::InstantMouseController(hid_device* dev_handle, const hid_device_info& info)
|
||||
{
|
||||
dev = dev_handle;
|
||||
location = info.path;
|
||||
version = "";
|
||||
|
||||
wchar_t serial_string[128];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, 128);
|
||||
|
||||
if(ret != 0)
|
||||
{
|
||||
serial_number = "";
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstring return_wstring = serial_string;
|
||||
serial_number = std::string(return_wstring.begin(), return_wstring.end());
|
||||
}
|
||||
}
|
||||
|
||||
InstantMouseController::~InstantMouseController()
|
||||
@@ -44,7 +32,15 @@ std::string InstantMouseController::GetDeviceLocation()
|
||||
|
||||
std::string InstantMouseController::GetSerialString()
|
||||
{
|
||||
return(serial_number);
|
||||
wchar_t serial_string[128];
|
||||
int ret = hid_get_serial_number_string(dev, serial_string, 128);
|
||||
|
||||
if(ret != 0)
|
||||
{
|
||||
return("");
|
||||
}
|
||||
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string InstantMouseController::GetFirmwareVersion()
|
||||
|
||||
Reference in New Issue
Block a user