Skip to content

Commit

Permalink
Merge pull request #930 from steveseguin/v20.x-dev-patches
Browse files Browse the repository at this point in the history
V20.4 merge
  • Loading branch information
steveseguin authored Jan 24, 2022
2 parents 92d8aa6 + 0b64e44 commit 871b4c3
Show file tree
Hide file tree
Showing 7 changed files with 2,312 additions and 1,119 deletions.
16 changes: 16 additions & 0 deletions iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@
button.onclick = function(){iframe.contentWindow.postMessage({"getStreamIDs":true}, '*');};
iframeContainer.appendChild(button);

var button = document.createElement("button");
button.innerHTML = "get media device list";
button.onclick = function(){iframe.contentWindow.postMessage({"getDeviceList":true}, '*');};
iframeContainer.appendChild(button);

var button = document.createElement("button");
button.innerHTML = "Start AutoMixer";
button.onclick = function(){iframe.contentWindow.postMessage({"automixer":true}, '*');};
Expand Down Expand Up @@ -347,6 +352,17 @@
iframeContainer.appendChild(outputWindow);
}

if ("deviceList" in e.data){
var outputWindow = document.createElement("div");
outputWindow.innerHTML = "child-page-action: deviceList<br />";
for (var i = 0;i<e.data.deviceList.length;i++){
outputWindow.innerHTML += e.data.deviceList[i].label + "<br />";
}
outputWindow.style.border="1px dotted black";
iframeContainer.appendChild(outputWindow);
}


if ("loudness" in e.data){
console.log(e.data);
if (document.getElementById("loudness")){
Expand Down
148 changes: 90 additions & 58 deletions index.html

Large diffs are not rendered by default.

Loading

0 comments on commit 871b4c3

Please sign in to comment.