videoview: use device friendly name in context menu

Change-Id: Ic1b6d05bf8fe729359bb76769770a5b4922b7e62

settingswidget.cpp

@@ -1047,16 +1047,11 @@ void SettingsWidget::slotDeviceBoxCurrentIndexChanged(int index)
         .toStdString();
     auto devices = LRCInstance::avModel().getDevices();
     try {
-        auto iter = std::find_if(devices.begin(), devices.end(),
-            [deviceName](const std::string& d) {
-                auto settings = LRCInstance::avModel().getDeviceSettings(d);
-                return settings.name == deviceName;
-            });
-        if (iter == devices.end()) {
+        auto deviceId = LRCInstance::avModel().getDeviceIdFromName(deviceName);
+        if (deviceId.empty()) {
             qWarning() << "Couldn't find device: " << deviceName.c_str();
             return;
         }
-        auto deviceId = *iter;
         LRCInstance::avModel().setCurrentVideoCaptureDevice(deviceId);
         LRCInstance::avModel().setDefaultDevice(deviceId);
         setFormatListForDevice(deviceId);

videoview.cpp

@@ -191,7 +191,9 @@ VideoView::showContextMenu(const QPoint& position)
     auto devices = LRCInstance::avModel().getDevices();
     auto device = LRCInstance::avModel().getCurrentVideoCaptureDevice();
     for (auto d : devices) {
-        auto deviceName = QString::fromStdString(d).toUtf8();
+        try {
+            auto settings = LRCInstance::avModel().getDeviceSettings(d);
+            QString deviceName = QString::fromStdString(settings.name).toUtf8();
             auto deviceAction = new QAction(deviceName, this);
             menu.addAction(deviceAction);
             deviceAction->setCheckable(true);
@@ -200,14 +202,19 @@ VideoView::showContextMenu(const QPoint& position)
             }
             connect(deviceAction, &QAction::triggered,
                 [this, deviceName]() {
-                auto device = deviceName.toStdString();
-                if (LRCInstance::avModel().getCurrentVideoCaptureDevice() == device) {
+                    auto deviceId = LRCInstance::avModel().getDeviceIdFromName(deviceName.toStdString());
+                    if (deviceId.empty()) {
+                        qWarning() << "Couldn't find device: " << deviceName;
+                        return;
+                    }
+                    if (LRCInstance::avModel().getCurrentVideoCaptureDevice() == deviceId) {
                         return;
                     }
-                LRCInstance::avModel().switchInputTo(device);
+                    LRCInstance::avModel().switchInputTo(deviceId);
                     resetPreview();
-                LRCInstance::avModel().setCurrentVideoCaptureDevice(device);
+                    LRCInstance::avModel().setCurrentVideoCaptureDevice(deviceId);
                 });
+        } catch (...) {}
     }
 
     menu.addSeparator();