Merge pull request #1055 from steveseguin/video-audio-setting-move

for lind to play with
This commit is contained in:
Steve Seguin 2023-04-15 14:29:40 -04:00 committed by GitHub
commit b8b773dcb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 19 deletions

View File

@ -1463,7 +1463,9 @@
<span data-translate="advanced-camera-settings">Video</span> <span data-translate="advanced-camera-settings">Video</span>
</button> </button>
</div> </div>
</div> </div>
<div class='row one hidden advancedAudioSettings'></div>
<div class='row one hidden advancedVideoSettings'></div>
<div class="flexBreak"><span data-translate="more">More</span></div> <div class="flexBreak"><span data-translate="more">More</span></div>
<button class="hideDropMenu" onclick="toggleByDataset('1');getById('chevarrow3').classList.toggle('bottom');getById('chevarrow3').classList.toggle('right');"> <button class="hideDropMenu" onclick="toggleByDataset('1');getById('chevarrow3').classList.toggle('bottom');getById('chevarrow3').classList.toggle('right');">
<i id="chevarrow3" style="padding:0px 7px 0 3px;" class="chevron right" aria-hidden="true"></i> <i id="chevarrow3" style="padding:0px 7px 0 3px;" class="chevron right" aria-hidden="true"></i>
@ -2473,7 +2475,7 @@
// session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements. // session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements.
// session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function // session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function
</script> </script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=740"></script> <script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=741"></script>
<!-- <!--
// If you wish to change branding, blank offers a good clean start. // If you wish to change branding, blank offers a good clean start.
<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script> <script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>

35
lib.js
View File

@ -15819,13 +15819,13 @@ function requestAudioSettings(ele) {
if (ele.value == 1) { if (ele.value == 1) {
ele.value = 0; ele.value = 0;
ele.classList.remove("pressed"); ele.classList.remove("pressed");
getById("advanced_audio_director_" + UUID).innerHTML = ""; query("#container_"+UUID+" .advancedAudioSettings").innerHTML = "";
getById("advanced_audio_director_" + UUID).classList.add("hidden"); query("#container_"+UUID+" .advancedAudioSettings").classList.add("hidden");
return false; return false;
} else { } else {
ele.value = 1; ele.value = 1;
ele.classList.add("pressed"); ele.classList.add("pressed");
getById("advanced_audio_director_" + UUID).innerHTML = ""; query("#container_"+UUID+" .advancedAudioSettings").innerHTML = "";
var actionMsg = {}; var actionMsg = {};
actionMsg.getAudioSettings = true; actionMsg.getAudioSettings = true;
session.sendRequest(actionMsg, UUID); session.sendRequest(actionMsg, UUID);
@ -15838,13 +15838,14 @@ function requestVideoSettings(ele) {
if (ele.value == 1) { if (ele.value == 1) {
ele.value = 0; ele.value = 0;
ele.classList.remove("pressed"); ele.classList.remove("pressed");
getById("advanced_video_director_" + UUID).innerHTML = "";
getById("advanced_video_director_" + UUID).classList.add("hidden"); query("#container_"+UUID+" .advancedVideoSettings").innerHTML = "";
query("#container_"+UUID+" .advancedVideoSettings").classList.add("hidden");
return false; return false;
} else { } else {
ele.value = 1; ele.value = 1;
ele.classList.add("pressed"); ele.classList.add("pressed");
getById("advanced_video_director_" + UUID).innerHTML = ""; query("#container_"+UUID+" .advancedVideoSettings").innerHTML = "";
var actionMsg = {}; var actionMsg = {};
actionMsg.getVideoSettings = true; actionMsg.getVideoSettings = true;
session.sendRequest(actionMsg, UUID); session.sendRequest(actionMsg, UUID);
@ -18327,7 +18328,7 @@ function gotDevicesRemote(deviceInfos, UUID) {
}; };
var videoSelectDiv = document.createElement("div"); var videoSelectDiv = document.createElement("div");
getById("advanced_video_director_" + UUID).appendChild(videoSelectDiv); query("#container_"+UUID+" .advancedVideoSettings").appendChild(videoSelectDiv);
videoSelectDiv.appendChild(videoSelect); videoSelectDiv.appendChild(videoSelect);
videoSelectDiv.appendChild(buttonGO); videoSelectDiv.appendChild(buttonGO);
} }
@ -18368,7 +18369,7 @@ function gotDevicesRemote(deviceInfos, UUID) {
session.sendRequest(data, UUID); // Viewer is requesting the PUBLISHER session.sendRequest(data, UUID); // Viewer is requesting the PUBLISHER
} }
var audioSelectDiv = document.createElement("div"); var audioSelectDiv = document.createElement("div");
getById("advanced_audio_director_" + UUID).appendChild(audioSelectDiv); query("#container_"+UUID+" .advancedAudioSettings").appendChild(audioSelectDiv);
audioSelectDiv.appendChild(audioSelect); audioSelectDiv.appendChild(audioSelect);
audioSelectDiv.appendChild(buttonGO); audioSelectDiv.appendChild(buttonGO);
@ -18406,7 +18407,7 @@ function gotDevicesRemote(deviceInfos, UUID) {
} }
var audioOutputSelectContainer = document.createElement("div"); var audioOutputSelectContainer = document.createElement("div");
getById("advanced_audio_director_" + UUID).appendChild(audioOutputSelectContainer); query("#container_"+UUID+" .advancedAudioSettings").appendChild(audioOutputSelectContainer);
audioOutputSelectContainer.appendChild(audioOutputSelect); audioOutputSelectContainer.appendChild(audioOutputSelect);
audioOutputSelectContainer.appendChild(buttonGO); audioOutputSelectContainer.appendChild(buttonGO);
} }
@ -24339,8 +24340,8 @@ function toggleSystemPip(vid) {
function updateDirectorsAudio(dataN, UUID) { function updateDirectorsAudio(dataN, UUID) {
var audioEle = document.createElement("div"); var audioEle = document.createElement("div");
getById("advanced_audio_director_" + UUID).innerHTML = ""; query("#container_"+UUID+" .advancedAudioSettings").innerHTML = "";
getById("advanced_audio_director_" + UUID).classList.remove("hidden"); query("#container_"+UUID+" .advancedAudioSettings").classList.remove("hidden");
//log(dataN); //log(dataN);
if (!dataN.length) { if (!dataN.length) {
@ -25046,7 +25047,7 @@ function updateDirectorsAudio(dataN, UUID) {
audioEle.appendChild(input); audioEle.appendChild(input);
} }
getById("advanced_audio_director_" + UUID).appendChild(audioEle); query("#container_"+UUID+" .advancedAudioSettings").appendChild(audioEle);
} }
} }
@ -25435,9 +25436,9 @@ function updateDirectorsVideo(data, UUID) {
} }
} }
getById("advanced_video_director_" + UUID).innerHTML = ""; query("#container_"+UUID+" .advancedVideoSettings").innerHTML = "";
getById("advanced_video_director_" + UUID).appendChild(videoEle); query("#container_"+UUID+" .advancedVideoSettings").appendChild(videoEle);
getById("advanced_video_director_" + UUID).classList.remove("hidden"); query("#container_"+UUID+" .advancedVideoSettings").classList.remove("hidden");
} }
/////// ///////
@ -35562,8 +35563,8 @@ function createControlBoxScreenshare(UUID, soloLink, streamID) {
iframeDetails.id = "iframeDetails_" + UUID; // needed to delete on user disconnect iframeDetails.id = "iframeDetails_" + UUID; // needed to delete on user disconnect
iframeDetails.className = "iframeDetails hidden"; iframeDetails.className = "iframeDetails hidden";
controls.innerHTML += "<div id='advanced_audio_director_" + UUID + "' class='hidden advancedAudioSettings'></div>"; //controls.innerHTML += "<div id='advanced_audio_director_" + UUID + "' class='hidden advancedAudioSettings'></div>";
controls.innerHTML += "<div id='advanced_video_director_" + UUID + "' class='hidden advancedVideoSettings'></div>"; //controls.innerHTML += "<div id='advanced_video_director_" + UUID + "' class='hidden advancedVideoSettings'></div>";
var handsID = "hands_" + UUID; var handsID = "hands_" + UUID;