elias/vdo.ninja
1
0
Fork 0
mirror of https://github.com/eliasstepanik/vdo.ninja.git synced 2026-01-24 11:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Steve Seguin 2022-01-23 18:27:07 -05:00 committed by GitHub
parent d10fd3c7c5
commit ddf52dd4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 375 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.html
View File

@ -54,7 +54,7 @@
transition: opacity .1s linear; transition: opacity .1s linear;
} }
</style> </style>
<link rel="stylesheet" href="./main.css?ver=150" /> <link rel="stylesheet" href="./main.css?ver=151" />
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/adapter.min.js"></script> <script type="text/javascript" crossorigin="anonymous" src="./thirdparty/adapter.min.js"></script>
<style id="lightbox-animations" type="text/css"></style> <style id="lightbox-animations" type="text/css"></style>
</head> </head>
@ -67,7 +67,7 @@
<link itemprop="url" href="./media/vdoNinja_logo_full.png" /> <link itemprop="url" href="./media/vdoNinja_logo_full.png" />
</span> </span>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=36"></script> <script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=36"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=344"></script> <script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=345"></script>
<input id="zoomSlider" type="range" style="display: none;" /> <input id="zoomSlider" type="range" style="display: none;" />
<div id="header"> <div id="header">
@ -281,7 +281,7 @@
<span data-translate="scenes-can-see-director" style="cursor: help;" title="If checked, the director can be added to scenes as if a guest. Otherwise, the director will never appear in a scene." >The director will be performing as well, appearing in group scenes</span> <span data-translate="scenes-can-see-director" style="cursor: help;" title="If checked, the director can be added to scenes as if a guest. Otherwise, the director will never appear in a scene." >The director will be performing as well, appearing in group scenes</span>
</b> </b>
</th> </th>
</tr><tr style="display:none;"> </tr><tr>
<th style="text-align:right; padding: 5px;"> <th style="text-align:right; padding: 5px;">
</th> </th>
@ -344,7 +344,7 @@
<div class="container-inner"> <div class="container-inner">
<br /> <br />
<p> <p>
<video id="previewWebcam" class="previewWebcam task" data-menu="context-menu-video" oncanplay="updateStats();" controlsList="nodownload" muted autoplay playsinline ></video> <video id="previewWebcam" class="previewWebcam task" title="Right-click this video for additional options" data-menu="context-menu-video" oncanplay="updateStats();" controlsList="nodownload" muted autoplay playsinline ></video>
</p> </p>
<div id="infof"></div> <div id="infof"></div>
<button onclick="this.disabled=true;setTimeout(function(){requestBasicPermissions();},20);" id="getPermissions" style="display:none;" data-ready="false" > <button onclick="this.disabled=true;setTimeout(function(){requestBasicPermissions();},20);" id="getPermissions" style="display:none;" data-ready="false" >
@ -1358,7 +1358,7 @@
<span data-translate="request-upload"> Request File</span> <span data-translate="request-upload"> Request File</span>
</button> </button>
<button class="hidden mainonly" data-cluster="2" data-action-type="create-timer" data-value="0" title="Set a countdown timer that this guest sees" onclick="directTimer(this, event);"> <button class="hidden mainonly" data-cluster="2" data-action-type="create-timer" data-value="0" title="Set a countdown timer that this guest sees. CTRL (cmd) + click to pause." onclick="directTimer(this, event);">
<i class="las la-clock"></i> <i class="las la-clock"></i>
<span data-translate="create-timer">Create Timer</span> <span data-translate="create-timer">Create Timer</span>
</button> </button>
@ -1872,7 +1872,7 @@
var session = WebRTC.Media; // session is a required global variable if configuring manually. Run before loading main.js but after webrtc.js. var session = WebRTC.Media; // session is a required global variable if configuring manually. Run before loading main.js but after webrtc.js.
session.version = "20.2"; session.version = "20.3";
session.streamID = session.generateStreamID(); // randomly generates a streamID for this session. You can set your own programmatically if needed session.streamID = session.generateStreamID(); // randomly generates a streamID for this session. You can set your own programmatically if needed
session.defaultPassword = "someEncryptionKey123"; // Change this password if self-deploying for added security/privacy session.defaultPassword = "someEncryptionKey123"; // Change this password if self-deploying for added security/privacy
@ -1937,11 +1937,11 @@
// session.introOnClean = true; // this will load the page with the webcam selection screen if &push or &room is in the URL; no need to use &webcam. // session.introOnClean = true; // this will load the page with the webcam selection screen if &push or &room is in the URL; no need to use &webcam.
</script> </script>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script> <script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=255"></script> <script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=256"></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>
--> -->
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=289"></script> <script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=290"></script>
</body> </body>
</html> </html>

610
lib.js
View File

File diff suppressed because it is too large Load Diff

17
main.css
View File

@ -201,7 +201,9 @@ button.grey {
.red2 { .red2 {
background-color: #840000 !important; background-color: #840000 !important;
} }
.blue {
background-color: #000084 !important;
}
.orange { .orange {
background-color: #673100 !important; background-color: #673100 !important;
@ -576,7 +578,7 @@ hr {
left: -1px; left: -1px;
padding: 0; padding: 0;
position: absolute; position: absolute;
font-size: 0.55em; font-size: 0.54em;
display: none; display: none;
} }
@ -797,6 +799,10 @@ button.glyphicon-button.active.focus {
.roomnotes{ .roomnotes{
display:none!important; display:none!important;
} }
#head5 {
margin-right: 1px;
}
} }
@media only screen and (max-width: 400px){ @media only screen and (max-width: 400px){
#subControlButtons { #subControlButtons {
@ -3022,7 +3028,7 @@ span#guestTips {
.video-meter { .video-meter {
padding:0.5vh; padding:0.5vh;
display:none; display:block;
width:0.5vh; width:0.5vh;
height:0.5vh; height:0.5vh;
min-width:10px; min-width:10px;
@ -3038,7 +3044,7 @@ span#guestTips {
.video-meter-2 { .video-meter-2 {
padding:0; padding:0;
display:none; display:block;
width:100%; width:100%;
height:100%; height:100%;
min-width:10px; min-width:10px;
@ -3059,7 +3065,7 @@ span#guestTips {
right: 10px; right: 10px;
} }
.video-meter2 { .video-meter2 {
display:none; display:block;
padding:0; padding:0;
width: 4px; width: 4px;
height:0%; height:0%;
@ -3497,6 +3503,7 @@ input:checked + .slider:before {
.alertModal { .alertModal {
width: 90%; width: 90%;
} }
} }
.iframeDetails { .iframeDetails {

25
main.js
View File

@ -1463,9 +1463,9 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
} }
} }
//if (navigator.userAgent.indexOf('Mac OS X') != -1) { if (navigator.userAgent.indexOf('Mac OS X') != -1) {
// session.codec = "h264"; // default the codec to h264 if OBS is on macOS (that's all it supports with hardware) // oct 2021, OBS now supports vp8 and actually breaks with h264 android devices. session.codec = "h264"; // default the codec to h264 if OBS is on macOS (that's all it supports with hardware) // oct 2021, OBS now supports vp8 and actually breaks with h264 android devices.
//} }
if (session.disableOBS===false){ if (session.disableOBS===false){
window.addEventListener("obsSourceVisibleChanged", obsSourceVisibleChanged); window.addEventListener("obsSourceVisibleChanged", obsSourceVisibleChanged);
@ -1482,7 +1482,6 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
} }
} }
if (urlParams.has('chroma')) { if (urlParams.has('chroma')) {
log("Chroma ENABLED"); log("Chroma ENABLED");
getById("main").style.backgroundColor = "#" + (urlParams.get('chroma') || "0F0"); getById("main").style.backgroundColor = "#" + (urlParams.get('chroma') || "0F0");
@ -2597,21 +2596,25 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
session.queue = true; session.queue = true;
} }
if (urlParams.has('permaid') || urlParams.has('push')) { if (urlParams.has('push') || urlParams.has('id') || urlParams.has('permaid') ) {
session.permaid = urlParams.get('push') || urlParams.get('permaid'); session.permaid = urlParams.get('push') || urlParams.get('id') || urlParams.get('permaid');
if (session.permaid) { if (session.permaid) {
session.streamID = sanitizeStreamID(session.permaid); session.streamID = sanitizeStreamID(session.permaid);
} else { } else {
session.permaid = null; session.permaid = null;
} }
if (urlParams.has('permaid')) { if (urlParams.has('push')){
updateURL("permaid=" + session.streamID, true, false); // I'm not deleting the permaID first tho... updateURL("push="+session.streamID, true, false);
} else if (urlParams.has('id')){
updateURL("id="+session.streamID, true, false); // not 'officially' supporting this yet; we'll see.
} else if (urlParams.has('permaid')){
updateURL("permaid="+session.streamID, true, false);
} else { } else {
updateURL("push=" + session.streamID, true, false); // I'm not deleting the permaID first tho... updateURL("push="+session.streamID, true, false);
} }
if (urlParams.has('director') || urlParams.has('dir')) { // if I do a short form of this, it will cause duplications in the code elsewhere. if (urlParams.has('director') || urlParams.has('dir')) { // if I do a short form of this, it will cause duplications in the code elsewhere.
//var director_room_input = urlParams.get('director'); //var director_room_input = urlParams.get('director');
//director_room_input = sanitizeRoomName(director_room_input); //director_room_input = sanitizeRoomName(director_room_input);

2
webrtc.js
View File

File diff suppressed because one or more lines are too long