Merge branch 'develop' of https://github.com/steveseguin/vdo.ninja into Screenshare-Buttons-fixed

This commit is contained in:
steveseguin 2023-04-10 16:57:53 -04:00
commit 387889a90e
2 changed files with 26 additions and 11 deletions

17
lib.js
View File

@ -18076,7 +18076,6 @@ function gotDevicesRemote(deviceInfos, UUID) {
} else {
var videoSelect = document.createElement("select");
videoSelect.id = "remoteVideoSelect_"+UUID;
videoSelect.style = "font-size: 70% !important;";
@ -18118,7 +18117,6 @@ function gotDevicesRemote(deviceInfos, UUID) {
} else {
var audioSelect = document.createElement("select");
audioSelect.id = "remoteAudioSelect_"+UUID;
audioSelect.style = "font-size: 70% !important;";
audioSelect.onchange = function(){
@ -18160,7 +18158,6 @@ function gotDevicesRemote(deviceInfos, UUID) {
} else {
var audioOutputSelect = document.createElement("select");
audioOutputSelect.id = "remoteAudioOutputSelect_"+UUID;
audioOutputSelect.style = "font-size: 70% !important;";
audioOutputSelect.onchange = function(){
if (session.rpcs[UUID].stats.info && session.rpcs[UUID].stats.info.consent){
@ -24410,7 +24407,7 @@ function updateDirectorsAudio(dataN, UUID) {
input.dataset.track = n;
input.dataset.UUID = UUID;
input.id = "constraints_" + i + "_"+UUID;
input.style = "display:block; width:100%;margin:10px 0;";
input.style = "display:block; width:100%; margin: 2px 0px 5px;";
input.name = "constraints_" + i;
manualInput.onchange = function(e) {
@ -24531,9 +24528,9 @@ function updateDirectorsAudio(dataN, UUID) {
if (data.trackLabel) {
var label = document.createElement("label");
label.innerText = data.trackLabel;
label.style.margin = "20px 0 10px 0";
label.style.display = "block";
label.id = "remoteAudioLabel_"+UUID+"_"+n+ "_"+UUID;
label.classList.add("settingsLabel");
audioEle.appendChild(label);
}
}
@ -24754,6 +24751,7 @@ function updateDirectorsAudio(dataN, UUID) {
if (data.subGain!==false) {
var label = document.createElement("label");
var i = "Gain";
var div = document.createElement("div");
label.id = "label_" + i + "_"+n+ "_"+UUID;
label.htmlFor = "constraints_" + i + "_" + n+ "_"+UUID;
@ -24783,7 +24781,7 @@ function updateDirectorsAudio(dataN, UUID) {
input.id = "constraints_" + i + "_" + n+ "_"+UUID;
input.style = "display:block; width:100%;";
input.name = input.id;
input.style.margin = "10px 0";
input.style.margin = "2px 0px 5px";
manualInput.onchange = function(e) {
getById("constraints_" + e.target.dataset.keyname + "_"+e.target.dataset.track + "_"+ e.target.dataset.UUID).value = parseFloat(e.target.value);
@ -24803,8 +24801,9 @@ function updateDirectorsAudio(dataN, UUID) {
}
};
audioEle.appendChild(label);
audioEle.appendChild(manualInput);
audioEle.appendChild(div)
div.appendChild(label);
div.appendChild(manualInput);
audioEle.appendChild(input);
}
@ -24978,7 +24977,7 @@ function updateDirectorsVideo(data, UUID) {
input.dataset.UUID = UUID;
input.id = "constraints_" + i + "_" + UUID;
input.name = input.id;
input.style = "display:block; width:100%;margin: 10px 0;";
input.style = "display:block; width:100%; margin: 2px 0px 5px;";
input.manualMode = manualMode;

View File

@ -659,11 +659,11 @@ body.darktheme .credits>a:visited {
background-color: #ccc;
width: 100%;
gap: 4px;
font-size: 14px;
}
.advancedAudioSettings div {
display: flex;
width: 100%;
overflow: hidden;
align-items: center;
gap: 4px;
}
@ -681,13 +681,29 @@ body.darktheme .credits>a:visited {
height: 24px;
}
.advancedAudioSettings div:nth-child(1) {
.advancedAudioSettings > div:nth-child(1) {
flex-direction: column;
align-items: flex-start;
width: 100%;
padding: unset;
}
.darktheme .advancedAudioSettings .settingsLabel {
background-color: var(--discord-grey-7);
border: 1px solid var(--discord-grey-1);
box-shadow: 1px 1px 3px var(--discord-grey-1);
}
.advancedAudioSettings .settingsLabel {
background-color: #bbb;
padding: 5px;
border-radius: 4px;
display: block;
border: 1px solid #999;
box-shadow: 1px 1px 3px #999;
margin: 5px -2px 0px;
}
.advancedVideoSettings div:nth-child(2) {
display: flex;
width: 100%;