Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/cab/out/dudescab/DudesCab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ std::vector<DudesCab::Device*> DudesCab::FindDevices()
else
productName = "<not available>";
#else
productName = std::string(reinterpret_cast<const char*>(cur_dev->product_string));
std::wstring wstr(cur_dev->product_string);
productName = std::string(wstr.begin(), wstr.end());
#endif
}

Expand All @@ -249,7 +250,8 @@ std::vector<DudesCab::Device*> DudesCab::FindDevices()
else
serialNumber = "<not available>";
#else
serialNumber = std::string(reinterpret_cast<const char*>(cur_dev->serial_number));
std::wstring wserial(cur_dev->serial_number);
serialNumber = std::string(wserial.begin(), wserial.end());
#endif
}
else
Expand All @@ -264,6 +266,10 @@ std::vector<DudesCab::Device*> DudesCab::FindDevices()
deviceRid = Device::RIDType::RIDOutputs;
else if (productName == "DudesCab Outputs MX")
deviceRid = Device::RIDType::RIDOutputsMx;
#if defined(__linux__) || defined(__APPLE__)
else if (productName == "DudesCab" && cur_dev->interface_number == static_cast<int>(Device::RIDType::RIDOutputs))
deviceRid = Device::RIDType::RIDOutputs;
#endif

if (deviceRid != Device::RIDType::None)
{
Expand Down