version 8.01

minor bug fixes
steveseguin · Jun 29, 2020 · 3719f4a · 3719f4a
1 parent 4ec298f
commit 3719f4a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 18 deletions.
diff --git a/index.html b/index.html
@@ -38,7 +38,7 @@
 		<script type="text/javascript" src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
 		<script type="text/javascript" src="./thirdparty/qrcode.min.js"></script>
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
-		<link rel="stylesheet" href="./main.css" />
+		<link rel="stylesheet" href="./main.css?ver=2" />
 	</head>
 	<body id="main" class="cat">
 		<span itemprop="image" itemscope itemtype="image/png">
@@ -48,8 +48,8 @@
 		<span itemprop="thumbnail" itemscope itemtype="http://schema.org/ImageObject">
 			<link itemprop="url" href="./images/obsNinja_logo_full.png" />
 		</span>
-		<script language="javascript" type="text/javascript" src="./thirdparty/CodecsHandler.js?ver=5"></script>
-		<script language="javascript" type="text/javascript" src="./webrtc.js?ver=6"></script>
+		<script language="javascript" type="text/javascript" src="./thirdparty/CodecsHandler.js?ver=6"></script>
+		<script language="javascript" type="text/javascript" src="./webrtc.js?ver=7"></script>
 		<input id="zoomSlider" type="range" style="display: none;" />
 		<div id="header">
 			<a id="logoname" href="./" style="text-decoration: none; color: white; margin: 2px;">
@@ -60,7 +60,7 @@
 			<div id="head1" style="display: inline-block; position: relative;">
 
 			</div>
-			<div id="head3" style="display: inline-block;" class="advanced">
+			<div id="head3" style="display: block;" class="advanced">
 				<font style="color: #888;" id="copythisurl"> &nbsp; 
 					<span data-translate="copy-this-url">Copy this URL into an OBS "Browser Source"</span> <i style="color: #CCC;" class="las la-long-arrow-alt-right"></i> &nbsp; 
 				</font>
@@ -435,7 +435,7 @@ <h2>What is OBS.Ninja</h2>
 							</li>
 							<br />
 
-                            Site last updated: June 28th, 2020. The previous version can be found at 
+                            Site last updated: <a href="https://www.reddit.com/r/OBSNinja/comments/hhba50/version_8_just_released_see_the_change_log_here/">June 28th, 2020</a>. The previous version can be found at 
 							<a href="https://obs.ninja/v7/">https://obs.ninja/v7/</a> if you are having new issues.
 
 
@@ -585,9 +585,11 @@ <h3>
             // session.scene
             // session.title // "zzzz"
         </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" id="main-js" src="./main.js?ver=9"></script>
 		<script type="text/javascript" src="./animations.js"></script>
 	</body>
 </html>
diff --git a/main.css b/main.css
@@ -51,7 +51,7 @@ button {
 
 #header {
 	width: 100%;
-	height: 24px;
+	min-height: 24px;
 	background-color:#0F131D;
 	color:#FFF;
 
@@ -283,7 +283,7 @@ body {
 	   #reshare{
 		   max-width:650px !important;
 		   font-size:96% !important;
-		   min-width:400px !important;
+		   width:300px !important;
 
 	   }
 		.fa-paperclip {
@@ -532,7 +532,7 @@ img {
 	z-index:5;
 	bottom:5px;
 	width:100%;
-	display: flex;
+	display: none;
 	justify-content: center;
 	align-items: center;
 	height: 60px;

diff --git a/main.js b/main.js
@@ -253,7 +253,11 @@ if (urlParams.has('password')){
 if (urlParams.has('stereo') || urlParams.has('s')){ // both peers need this enabled for HD stereo to be on. If just pub, you get no echo/noise cancellation. if just viewer, you get high bitrate mono 
 	log("STEREO ENABLED");
 	session.stereo = urlParams.get('stereo') || urlParams.get('s');
-	session.stereo = session.stereo.toLowerCase();
+	session.stereo = session.stereo;
+
+	if (session.stereo){
+		session.stereo = session.stereo.toLowerCase();
+	}
 
 	if (session.stereo=="false"){
 		session.stereo = 0;
@@ -284,8 +288,10 @@ if ((session.stereo==1) || (session.stereo==3)){
 if (urlParams.has("aec") || urlParams.has("ec")){
 
 	session.echoCancellation = urlParams.get('aec') || urlParams.get('ec');
-	session.echoCancellation.toLowerCase();
 
+	if (session.echoCancellation){
+		session.echoCancellation = session.echoCancellation.toLowerCase();
+	}
 	if (session.echoCancellation=="false"){
 		session.echoCancellation = false;
 	} else if (session.echoCancellation=="0"){
@@ -304,8 +310,9 @@ if (urlParams.has("aec") || urlParams.has("ec")){
 if (urlParams.has("autogain") || urlParams.has("ag")){
 
 	session.autoGainControl = urlParams.get('autogain') || urlParams.get('ag');
-	session.autoGainControl.toLowerCase();
-
+	if (session.echoCancellation){
+		session.autoGainControl.autoGainControl();
+	}
 	if (session.autoGainControl=="false"){
 		session.autoGainControl = false;
 	} else if (session.autoGainControl=="0"){
@@ -322,8 +329,10 @@ if (urlParams.has("autogain") || urlParams.has("ag")){
 if (urlParams.has("denoise") || urlParams.has("dn")){
 
 	session.noiseSuppression = urlParams.get('denoise') || urlParams.get('dn');
-	session.noiseSuppression.toLowerCase();
 
+	if (session.noiseSuppression){
+		session.noiseSuppression = session.noiseSuppression.toLowerCase();
+	}
 	if (session.noiseSuppression=="false"){
 		session.noiseSuppression = false;
 	} else if (session.noiseSuppression=="0"){
@@ -577,6 +586,15 @@ if (urlParams.has('cleanoutput') || urlParams.has('clean')){
 	session.cleanOutput = true;
 	getById("translateButton").style.display="none";
 	getById("credits").style.display="none";
+	getById("header").style.display="none";
+	var style = document.createElement('style');
+	style.innerHTML = `
+	video {
+		background-image: none;
+	}
+	`;
+	document.head.appendChild(style);
+
 }
 
 if (urlParams.has('channeloffset')){
@@ -1024,6 +1042,9 @@ function publishScreen(){
 			getById("helpbutton").className="float";
 			getById("mutevideobutton").className="float";
 			getById("hangupbutton").className="float";
+			getById("controlButtons").style.display="flex";
+		} else {
+			getById("controlButtons").style.display="none";
 		}
 		getById("head1").className = 'advanced';
 		getById("head2").className = 'advanced';
@@ -1058,6 +1079,7 @@ function publishWebcam(){
 		getById("head3").className = 'advanced';
 	} else {
 		getById("head3").className = '';
+		getById("logoname").style.display = 'none';
 	}
 
 	log("streamID is: "+session.streamID);
@@ -1069,6 +1091,9 @@ function publishWebcam(){
 		getById("helpbutton").className="float";
 		getById("mutevideobutton").className="float";
 		getById("hangupbutton").className="float";
+		getById("controlButtons").style.display="flex";
+	} else {
+		getById("controlButtons").style.display="none";
 	}
 	updateURL("push="+session.streamID);
 	session.publishStream(stream, title);
@@ -1155,8 +1180,6 @@ function createRoom(roomname=false){
 	getById("roomid").innerHTML = roomname;
 
 
-	//getById("mutebutton").className="float";
-	//getById("helpbutton").className="float";
 	session.director = true;
 	getById("reshare").parentNode.removeChild(getById("reshare"));
 

diff --git a/webrtc.js b/webrtc.js