Skip to content

Commit

Permalink
v21 production stable version (archiving)
Browse files Browse the repository at this point in the history 
director + meshcast doesn't work in this version, but it's pretty stable otherwise

this branch is just as an archive until v22 is stable
  • Loading branch information
@steveseguin
steveseguin authored Apr 27, 2022
1 parent 8808bf9 commit 979effb
Show file tree
Hide file tree
Showing 7 changed files with 796 additions and 638 deletions.
19 changes: 12 additions & 7 deletions electron.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@
flex-wrap: nowrap;
flex-grow: 1;
}
#version{
margin: 0 auto;
font-size: 30%;
display: inline-block;
color: #000A;
}

</style>
</head>
Expand Down Expand Up @@ -306,6 +312,7 @@

</div>
</div>
<div id="version"></div>


<script>
Expand Down Expand Up @@ -368,14 +375,15 @@
try {
if (navigator.userAgent.toLowerCase().indexOf(' electron/') > -1) {
function compareVersions(version){
document.getElementById("version").innerHTML = "Current version: "+version;
version = version.split(".");
fetch('https://api.github.com/repos/steveseguin/electroncapture/releases/latest')
.then(response => response.json())
.then(data => {
console.log("recentVersion: "+data.tag_name);
var recentVersion = data.tag_name.split(".");
var ood = false;
if (recentVersion[0]>version[0]){
if (recentVersion[0]>version[0]){
ood = true;
} else if (recentVersion[0]==version[0]) {
if (recentVersion[1]>version[1]){
Expand All @@ -392,19 +400,16 @@
}
}).catch(console.error);
}
if (urlParams.has('version')){
var ver = urlParams.get('version');
if (urlParams.has('version') || urlParams.has('ver')){
var ver = urlParams.get('version') || urlParams.get('ver');
console.log("version: "+ver);
compareVersions(ver);
} else{
var checkVersion = setTimeout(function(){ // pre 1.5.2
compareVersions("0.0.0");
},500);
document.getElementById("version").innerHTML = "Elevate app privilleges to see current version";
try{
const ipcRenderer = require('electron').ipcRenderer;
console.log("ELECTRON DETECTED");
ipcRenderer.on('appVersion', function(event, version) {
clearTimeout(checkVersion);
console.log("version: "+version);
compareVersions(version);
})
Expand Down
26 changes: 13 additions & 13 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
try {
var msie = window.navigator.userAgent.indexOf("MSIE ");
if (msie>0 || !!navigator.userAgent.match(/Trident.*rv\:11\./)){ // If MSIE or IE 11
document.write("Internet Explorer is not supported");
alert("Internet Explorer is not supported.\n\nPlease consider using Microsoft Edge or Google Chrome instead\n\nYou will be forwarded to the download page for MS Edge now.");
console.error("INTERNET EXPLORER IS EVIL");
window.location = "https://www.microsoft.com/edge";
Expand Down Expand Up @@ -79,7 +80,7 @@
<link itemprop="url" href="./media/vdoNinja_logo_full.png" />
</span>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=37"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=396"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=368"></script>
<input id="zoomSlider" type="range" style="display: none;" />
<div id="header">

Expand Down Expand Up @@ -149,7 +150,7 @@
<div id="mutespeakerbutton" onmousedown="event.preventDefault(); event.stopPropagation();" title="Mute the Speaker" onclick="toggleSpeakerMute()" tabindex="17" role="button" aria-pressed="false" onkeyup="enterPressedClick(event,this);" class="advanced float" style="cursor: pointer;" alt="Toggle the speaker output.">
<i id="mutespeakertoggle" class="toggleSize las la-volume-up my-float" style="position: relative; top: 0.5px;"></i>
</div>
<div id="mutebutton" onmousedown="toggleMute(false, event);event.preventDefault(); event.stopPropagation();" title="Mute the Mic" ontouchstart="toggleMute(false, event);event.preventDefault(); event.stopPropagation();" tabindex="18" role="button" aria-pressed="false" onkeyup="enterPressedClick(event,this);" class="advanced float" style="cursor: pointer;" alt="Toggle the mic">
<div id="mutebutton" onmousedown="event.preventDefault(); event.stopPropagation();" title="Mute the Mic" onclick="toggleMute()" tabindex="18" role="button" aria-pressed="false" onkeyup="enterPressedClick(event,this);" class="advanced float" style="cursor: pointer;" alt="Toggle the mic">
<i id="mutetoggle" class="toggleSize las la-microphone my-float" style="position: relative; top: 0.5px;"></i>
</div>
<div id="mutevideobutton" onmousedown="event.preventDefault(); event.stopPropagation();" title="Disable the Camera" alt="Disable the Camera" onclick="toggleVideoMute()" tabindex="19" role="button" aria-pressed="false" onkeyup="enterPressedClick(event,this);" class="advanced float" style="cursor: pointer;">
Expand Down Expand Up @@ -704,13 +705,13 @@ <h2><span data-translate="share-local-video-file">Stream Media File</span></h2>
<h1>Warning</h1>
<p>Media file streaming is still quite experimental. Please do not rely on it heavily for your productions. Feedback welcome.</p>
</div>
<div class='warning message-card advanced' id='chrome_warning_fileshare'>
<h1>Chrome/Edge users</h1>
<p>Keep this tab visible, else the video playback will stop</p>
<div class='warning message-card'>
<h1>Chrome users</h1>
<p>Keep this tab visible if using Chrome, else the video playback will stop</p>
</div>
<div class='warning message-card advanced' id='safari_warning_fileshare'>
<h1>Safari Users</h1>
<p>Safari does not support this feature. Consider Chrome or Firefox instead.</p>
<div class='info message-card'>
<h1>File Sharing seems to be broken on Chrome v88.</h1>
<p>Try <a href="https://github.com/aws/amazon-chime-sdk-js/issues/1031">turning off hardware-accleration</a> in Chrome/Edge to fix the issue, or maybe use a different browser.</p>
</div>
<br /><br />
To host a file for download, rather than for streaming, try the following instead:
Expand Down Expand Up @@ -1863,7 +1864,7 @@ <h3>Change guest settings</h3><br />
<source src="./media/tone.mp3" type="audio/mpeg">
<source src="./media/tone.ogg" type="audio/ogg">
</audio>
<div class="gone advanced" >
<div class="gone" >
<!-- This image is used when dragging elements -->
<img src="./media/favicon-32x32.png" id="dragImage" loading="lazy" />
</div>
Expand Down Expand Up @@ -1928,7 +1929,7 @@ <h3>Change guest settings</h3><br />


var session = WebRTC.Media; // session is a required global variable if configuring manually. Run before loading main.js but after webrtc.js.
session.version = "21.3";
session.version = "21.1";
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
Expand Down Expand Up @@ -1992,14 +1993,13 @@ <h3>Change guest settings</h3><br />
// session.title // "zzzz" ; sets the title of the browser page.
// 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.lowBitrateCutoff = 300; // Set a minimum bitrate (in kbps) before the stream is hidden. Useful for IRL streams maybe
// session.apiserver = "wss://api.vdo.ninja:443"; // specifiy a custom websocket API URL.
</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=279"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=265"></script>
<!--
// 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" crossorigin="anonymous" id="main-js" src="./main.js?ver=313"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=308"></script>
</body>
</html>
Loading

0 comments on commit 979effb

Please sign in to comment.