Skip to content

Commit bc77a08

Browse files
committed
DDA - Force instance capture timeout to all instances (Workaround)
1 parent 9d5e52a commit bc77a08

File tree

12 files changed

+4025
-24
lines changed

12 files changed

+4025
-24
lines changed

20250108_DDA.tar

40 KB
Binary file not shown.

20250117_mDNS.tar

50 KB
Binary file not shown.

CMakePresets.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@
5252
"hidden": true,
5353
"cacheVariables": {
5454
"ENABLE_AMLOGIC": "OFF",
55-
"ENABLE_DDA": "OFF",
55+
"ENABLE_DDA": "ON",
5656
"ENABLE_DISPMANX": "OFF",
5757
"ENABLE_DRM": "OFF",
5858
"ENABLE_DX": "OFF",
5959
"ENABLE_FB": "OFF",
6060
"ENABLE_MF": "OFF",
6161
"ENABLE_OSX": "OFF",
62-
"ENABLE_QT": "OFF",
62+
"ENABLE_QT": "ON",
6363
"ENABLE_V4L2": "OFF",
6464
"ENABLE_X11": "OFF",
6565
"ENABLE_XCB": "OFF",
6666
"ENABLE_AUDIO": "OFF",
67-
"ENABLE_DEV_FTDI": "OFF",
68-
"ENABLE_DEV_NETWORK": "OFF",
67+
"ENABLE_DEV_FTDI": "ON",
68+
"ENABLE_DEV_NETWORK": "ON",
6969
"ENABLE_DEV_SERIAL": "ON",
7070
"ENABLE_DEV_SPI": "OFF",
7171
"ENABLE_DEV_TINKERFORGE": "OFF",
@@ -78,9 +78,9 @@
7878
"ENABLE_FORWARDER": "OFF",
7979
"ENABLE_FLATBUF_CONNECT": "OFF",
8080
"ENABLE_EXPERIMENTAL": "OFF",
81-
"ENABLE_MDNS": "OFF",
81+
"ENABLE_MDNS": "ON",
8282
"ENABLE_REMOTE_CTL": "OFF",
83-
"ENABLE_EFFECTENGINE": "OFF",
83+
"ENABLE_EFFECTENGINE": "ON",
8484
"ENABLE_JSONCHECKS": "ON",
8585
"ENABLE_DEPLOY_DEPENDENCIES": "ON"
8686
}

assets/webconfig/js/content_grabber.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -327,22 +327,27 @@ $(document).ready(function () {
327327
$('#btn_submit_screengrabber').off().on('click', function () {
328328
let saveOptions = conf_editor_screen.getValue();
329329

330+
// As the DDA grabber will not issue updates when no screen activity, set all instances to a timeout of 5 minutes to avoid off/on blinking
331+
// until a better design is in place
332+
if (saveOptions.framegrabber.device === "dda") {
333+
let instCaptOptions = window.serverConfig.instCapture;
334+
instCaptOptions.systemEnable = saveOptions.framegrabber.enable;
335+
instCaptOptions.screenInactiveTimeout = DDA_INACTIVE_TIMEOUT;
336+
337+
saveOptions.instCapture = instCaptOptions;
338+
requestWriteConfig(saveOptions, false, getConfiguredInstances());
339+
return;
340+
}
341+
330342
const currentInstance = window.currentHyperionInstance;
331343
//If an instance exists, enable/disable grabbing in line with the global state
332344
if (currentInstance !== null && window.serverConfig.instCapture) {
333345
let instCaptOptions = window.serverConfig.instCapture;
334346
instCaptOptions.systemEnable = saveOptions.framegrabber.enable;
335-
336-
// As the DDA grabber will not issue updates when no screen activity, set the timeout to 5 minutes to avoid off/on blinking
337-
if (saveOptions.framegrabber.device === "dda" && instCaptOptions.screenInactiveTimeout < DDA_INACTIVE_TIMEOUT ) {
338-
instCaptOptions.screenInactiveTimeout = DDA_INACTIVE_TIMEOUT;
339-
} else {
340-
instCaptOptions.screenInactiveTimeout = window.schema.instCapture.properties.screenInactiveTimeout.default;
341-
}
347+
instCaptOptions.screenInactiveTimeout = window.schema.instCapture.properties.screenInactiveTimeout.default;
342348

343349
saveOptions.instCapture = instCaptOptions;
344350
}
345-
346351
requestWriteConfig(saveOptions);
347352
});
348353
}

0 commit comments

Comments
 (0)