frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'mediafoundation' of https://github.com/Paulchen-Panther/hyperion.ng into mediafoundation

Browse Source
This commit is contained in:
Paulchen Panther 2021-01-24 12:16:42 +01:00
commit aa20f87659
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/webconfig/js/content_grabber.js
View File

@ -84,20 +84,18 @@ $(document).ready(function () {
} }
} }
if (key != 'device_inputs' || enumVals.length > 0) { window.schema.grabberV4L2.properties[key] = {
window.schema.grabberV4L2.properties[key] = { "type": schema[key].type,
"type": schema[key].type, "title": schema[key].title,
"title": schema[key].title, ...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}),
...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}), // "enum": [].concat(["auto"], enumVals, ["custom"]),
// "enum": [].concat(["auto"], enumVals, ["custom"]), "options":
"options": {
{ "enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]),
"enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]), },
}, "propertyOrder": schema[key].propertyOrder,
"propertyOrder": schema[key].propertyOrder, "required": schema[key].required
"required": schema[key].required };
};
}
} }
}; };

1
src/hyperiond/systray.cpp
View File

@ -93,7 +93,6 @@ void SysTray::createTrayIcon()
{ {
if (efx.file.mid(0, 1) != ":") if (efx.file.mid(0, 1) != ":")
{ {
qDebug() << efx.file;
QAction *efxAction = new QAction(efx.name, this); QAction *efxAction = new QAction(efx.name, this);
connect(efxAction, SIGNAL(triggered()), this, SLOT(setEffect())); connect(efxAction, SIGNAL(triggered()), this, SLOT(setEffect()));
_trayIconEfxMenu->addAction(efxAction); _trayIconEfxMenu->addAction(efxAction);