scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: simplify device parsing

Browse Source
This commit is contained in:
Martin Piatka
2021-03-03 14:18:43 +01:00
parent 45d8002f66
commit 1777866a65
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/QT/option/available_settings.cpp
View File

@@ -169,15 +169,9 @@ void AvailableSettings::queryDevice(const QString &line, size_t offset){
Device dev;
QJsonObject obj = doc.object();
if(obj.contains("name") && obj["name"].isString()){
dev.name = obj["name"].toString().toStdString();
}
if(obj.contains("type") && obj["type"].isString()){
dev.type = obj["type"].toString().toStdString();
}
if(obj.contains("device") && obj["device"].isString()){
dev.deviceOpt = obj["device"].toString().toStdString();
}
maybeWriteString(obj, "name", dev.name);
maybeWriteString(obj, "type", dev.type);
maybeWriteString(obj, "device", dev.deviceOpt);
if(obj.contains("modes") && obj["modes"].isArray()){
for(const QJsonValue &val : obj["modes"].toArray()){
@@ -186,9 +180,7 @@ void AvailableSettings::queryDevice(const QString &line, size_t offset){
DeviceMode mode;
if(modeJson.contains("name") && modeJson["name"].isString()){
mode.name = modeJson["name"].toString().toStdString();
}
maybeWriteString(modeJson, "name", mode.name);
if(modeJson.contains("opts") && modeJson["opts"].isObject()){
QJsonObject modeOpts = modeJson["opts"].toObject();