From 4a7ce051bd4004fb62f1c7022d92efa2ce42b6ab Mon Sep 17 00:00:00 2001
From: Robin Krahl <me@robin-krahl.de>
Date: Sun, 13 Jan 2019 12:03:34 +0100
Subject: Change Device::enumerate return type to use DeviceInfo

The return type of Device::enumerate is changed from
std::vector<std::string> to std::vector<DeviceInfo> to expose the
additional information contained in the DeviceInfo struct.
---
 device.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'device.cc')

diff --git a/device.cc b/device.cc
index 80e4b38..506a68c 100644
--- a/device.cc
+++ b/device.cc
@@ -171,14 +171,17 @@ int Device::recv(void *packet) {
   return status;
 }
 
-std::vector<std::string> Device::enumerate(){
+std::vector<DeviceInfo> Device::enumerate(){
   //TODO make static
   auto pInfo = hid_enumerate(m_vid, m_pid);
   auto pInfo_ = pInfo;
-  std::vector<std::string> res;
+  std::vector<DeviceInfo> res;
   while (pInfo != nullptr){
-    std::string a (pInfo->path);
-    res.push_back(a);
+    std::string path(pInfo->path);
+    std::wstring serialNumber(pInfo->serial_number);
+    auto deviceModel = this->get_device_model();
+    DeviceInfo info = { deviceModel, path, serialNumber };
+    res.push_back(info);
     pInfo = pInfo->next;
   }
 
-- 
cgit v1.2.1