From 5919113e286642d1883daf0af2f32a4b8429465c Mon Sep 17 00:00:00 2001
From: USAMAWIZARD <usamawizard@gmail.com>
Date: Fri, 24 Nov 2023 16:47:21 +0530
Subject: [PATCH 1/4] add camera mic toggle add open in new tab button

---
 src/main/webapp/multitrack-conference.html | 97 ++++++++++++----------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/main/webapp/multitrack-conference.html b/src/main/webapp/multitrack-conference.html
index 347fe5dd..3589e1c9 100644
--- a/src/main/webapp/multitrack-conference.html
+++ b/src/main/webapp/multitrack-conference.html
@@ -133,14 +133,13 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 							id="join_publish_button">Join Room</button>
 					<button class="btn btn-primary" disabled
 							id="stop_publish_button">Leave Room</button>
+					<button class="btn btn-info"
+							id="open_in_new_tab">Join in new Tab</button>
 				</div>
 
 				<div style="padding:10px">
-					<button id="turn_off_camera_button" class="btn btn-outline-primary"  >Turn off Camera</button>
-					<button id="turn_on_camera_button" disabled class="btn btn-outline-primary"  >Turn on Camera</button>
-
-					<button id="mute_mic_button" class="btn btn-outline-primary">Mute Local Mic</button>
-					<button id="unmute_mic_button" disabled  class="btn btn-outline-primary">Unmute Local Mic</button>
+					<img id="toggle_camera_button" class="btn btn-outline-primary" src="images/camon.png" alt="Turn off Camera">
+					<img id="toggle_mic_button" class="btn btn-outline-primary"    src="images/unmute.png" alt="Unmute Local Mic">
 				</div>
 
 				<div class="form-check form-check-inline" >
@@ -258,14 +257,12 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 	join_publish_button.addEventListener("click", joinRoom, false);
 	var stop_publish_button = document.getElementById("stop_publish_button");
 	stop_publish_button.addEventListener("click", leaveRoom, false);
-	var turn_off_camera_button = document.getElementById("turn_off_camera_button");
-	turn_off_camera_button.addEventListener("click", turnOffLocalCamera,false)
-	var turn_on_camera_button = document.getElementById("turn_on_camera_button");
-	turn_on_camera_button.addEventListener("click", turnOnLocalCamera,false)
-	var mute_mic_button = document.getElementById("mute_mic_button");
-	mute_mic_button.addEventListener("click", muteLocalMic,false)
-	var unmute_mic_button = document.getElementById("unmute_mic_button");
-	unmute_mic_button.addEventListener("click", unmuteLocalMic,false)
+	var toggle_camera_button = document.getElementById("toggle_camera_button");
+	toggle_camera_button.addEventListener("click", toggleLocalCamera,false)
+	var toggle_mic_button = document.getElementById("toggle_mic_button");
+	toggle_mic_button.addEventListener("click", toggleLocalMic,false)
+	var open_in_new_tab = document.getElementById("open_in_new_tab");
+	open_in_new_tab.addEventListener("click",openInNewTab,false);
 	var options = document.getElementById("options");
 	options.addEventListener("click", toggleOptions, false);
 	var send = document.getElementById("send");
@@ -286,7 +283,10 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 	var roomNameBox = document.getElementById("roomName");
 
 	if (roomId != null) {
-		roomNameBox.value = roomId;
+	var roomname = getUrlParameter("roomname");
+	if(roomname != "undefined" && roomname != undefined)
+		roomNameBox.value=roomname;
+	roomNameBox.value = roomId;
 	}
 	
 	var isDataChannelOpen = false;
@@ -311,32 +311,43 @@ <h3 class="col text-muted">WebRTC Conference</h3>
   		}
 	}
 
-	function turnOffLocalCamera() {
-		webRTCAdaptor.turnOffLocalCamera();
-		isCameraOff = true;
-		handleCameraButtons();
-		sendNotificationEvent("CAM_TURNED_OFF");
+	function openInNewTab(){
+		let parrentURL= getUrlParameter("parrentURL")
+		if(parrentURL==null)
+			parrentURL=""
+		window.open(parrentURL+"?roomname="+roomNameBox.value );
 	}
 
-	function turnOnLocalCamera() {
-		webRTCAdaptor.turnOnLocalCamera();
-		isCameraOff = false;
-		handleCameraButtons();
-		sendNotificationEvent("CAM_TURNED_ON");
-	}
+	function toggleLocalCamera() {
+		if (isCameraOff) {
+			webRTCAdaptor.turnOnLocalCamera();
+			isCameraOff = false;
+			handleCameraButtons();
+			sendNotificationEvent("CAM_TURNED_ON");
+
+		}
+		else {
+			webRTCAdaptor.turnOffLocalCamera();
+			isCameraOff = true;
+			handleCameraButtons();
+			sendNotificationEvent("CAM_TURNED_OFF");
 
-	function muteLocalMic(){
-		webRTCAdaptor.muteLocalMic();
-		isMicMuted = true;
-		handleMicButtons();
-		sendNotificationEvent("MIC_MUTED");
+		}
 	}
 
-	function unmuteLocalMic() {
-		webRTCAdaptor.unmuteLocalMic();
-		isMicMuted = false;
-    handleMicButtons();
-		sendNotificationEvent("MIC_UNMUTED");
+	function toggleLocalMic() {
+		if (isMicMuted) {
+			webRTCAdaptor.unmuteLocalMic();
+			isMicMuted = false;
+			handleMicButtons();
+			sendNotificationEvent("MIC_UNMUTED");
+		}
+		else {
+			webRTCAdaptor.muteLocalMic();
+			isMicMuted = true;
+			handleMicButtons();
+			sendNotificationEvent("MIC_MUTED");
+		}
 	}
 
 	function sendNotificationEvent(eventType) {
@@ -380,22 +391,18 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 	}
 
 	function handleCameraButtons() {
-		if(isCameraOff) {
-			turn_off_camera_button.disabled = true;
-			turn_on_camera_button.disabled = false;
+		if (isCameraOff) {
+			toggle_camera_button.src = "./images/camoff.png";
 		} else {
-			turn_off_camera_button.disabled = false;
-			turn_on_camera_button.disabled = true;
+			toggle_camera_button.src = "./images/camon.png";
 		}
 	}
 
 	function handleMicButtons() {
-		if(isMicMuted) {
-			mute_mic_button.disabled = true;
-			unmute_mic_button.disabled = false;
+		if (isMicMuted) {
+			toggle_mic_button.src = "./images/mute.png"
 		} else {
-			mute_mic_button.disabled = false;
-			unmute_mic_button.disabled = true;
+			toggle_mic_button.src = "./images/unmute.png"
 		}
 	}
 

From d6bf3a224a288e711c6bfc79d46b5a53dffcccd3 Mon Sep 17 00:00:00 2001
From: USAMAWIZARD <usamawizard@gmail.com>
Date: Fri, 24 Nov 2023 17:21:39 +0530
Subject: [PATCH 2/4] add camera mic toggle add open in new tab button

---
 redeploy.sh                                |   2 +-
 src/main/webapp/images/camoff.png          | Bin 0 -> 579 bytes
 src/main/webapp/images/camon.png           | Bin 0 -> 374 bytes
 src/main/webapp/images/mute.png            | Bin 0 -> 1184 bytes
 src/main/webapp/images/unmute.png          | Bin 0 -> 1067 bytes
 src/main/webapp/multitrack-conference.html |   7 ++-----
 6 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 src/main/webapp/images/camoff.png
 create mode 100644 src/main/webapp/images/camon.png
 create mode 100644 src/main/webapp/images/mute.png
 create mode 100644 src/main/webapp/images/unmute.png

diff --git a/redeploy.sh b/redeploy.sh
index ac98e87f..0a1cd419 100755
--- a/redeploy.sh
+++ b/redeploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-AMS_DIR=~/softwares/ant-media-server
+AMS_DIR=/usr/local/antmedia
 mvn clean install -DskipTests -Dgpg.skip=true
 OUT=$?
 
diff --git a/src/main/webapp/images/camoff.png b/src/main/webapp/images/camoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..228c00df5ddfec6374744be6e75bde67f7936c0b
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkP^+`lQRCt{2*-c8rKp4jHzY8zmLW<x8^a6rASGug=B`Ui0v(=>=
z58xGqVEaxMf`SSzL_}1CqNflmxDhJ@q12MtB$G*|k_To}n7;Y-P4h8>f_s4{A1aJ;
z6g(>EDrk>1#)C-(&l)4}(u65SHC~BvG+x;mN8^>9aUeb{DmYirQLrC;R?+vD;67tz
z2z&@!`LJw^5ZDbVu$LF6ZycI-BI?&_6o9Fwf&{12Ute6$8FQKB`0rp`phobY7<L{v
z2CrroM<))T3u8X42)ycfBq&hN3&W7KU|zxXuQ>^e<boj@Fe`8zIwwUT>lg-d0@DIV
z3ce!eq$#8?*ETT(IfV&<1A)(>bJ7+Q*tB&uBZ$CT>^UX{1$Jz7h9HUNm=?8xp$Lc#
z3`IeLv7Hr$f+3k<Z~&smmMI2DAjTLRf*4_N4AQ%4CdJ?yBrOIPA!#tU3em%djkp+G
zh6sEMtjBrKB=3ht6U<+oA<xHnn;7zXv9gUJB2Add@>MrW%xc(w#vihC)`A5Ew}X&Q
zkr*G=((Igd2bY8Nx@%F8zRuJ_I@6A`r`cPe(~HMNLbAa0q8E={z_eg43rtnuLND{@
zjCdC~6Ikj$9wUrv@yeYuN8^>9aWr1p8As#&r_T6&_ZfkQqL0TY8lw>cH$PuhQI`h7
Rnj`=K002ovPDHLkV1kBm?<W8N

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/camon.png b/src/main/webapp/images/camon.png
new file mode 100644
index 0000000000000000000000000000000000000000..76821fa0069eabaa29566184958ee6f42d63890b
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkPC`m*?RCt{2naxeZKoEsLE;K;_Q~(ulM?s+t3PD2RN(=PBUyhy$
zxp1Tj1j+@8MH>#WQ6h&m@~*A-N$)t?_cY#JdkjJdA%v)5OfhB{A2^{m#r2FQ=A6+P
z<GNS#+jZ3?#I%3_bxl%(%nC4H*W;i3zp#&ULGOE_O~(690RnqC=Qyvcy6na`sf~&g
zoabiEkb)S;IQN@th7hFU5a$--YkN(}K^7cf+~9n+*OVN@S?*p_c95VT<nD&6BjoRZ
zI)YBEphwHKM}ls4bo}z)_sDV_?^=toyvC2_!|FE`M;Ld*57Hby%$qfF{F2*vQ*R`V
zgW}vZzxlczNE*<^;c<TRYZ<2`6NkrTgt$x(u?{m?wKd0Yg`aghbV3Lrgb+l&0SAz|
UdNAsw$^ZZW07*qoM6N<$f|DYjQ2+n{

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/mute.png b/src/main/webapp/images/mute.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9743bbf67567e5abbdb08a5f3618e7da5d2e3ad
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkSQb|NXRCt`#nO}%jMHIk)LD@e`GBYjGApDaOL`YACT2E0B3O)80
zDty)#BPs~%B?FbHo`W71-Tl5fcUMDbAJh`lGP5=xs$GPl9+GnVV~H!L&ctxL_q+Fg
zckZ{>fq~t*Gv}P&%$%8X=0o692PYC(M1-;j7CLxdKpdQMFm3gefJ@*x?L+J$@VUT@
zgRknq?1y;*uM7O9@_JPRdu<G^j|P&!B7uoIFbUjgGp;f&=xTJ~DS>4lz_nWSZ)+3l
zqflS#*v4SGaC6zQ9atrB#tb{=;GUu}+DH4^m@{2iO%pHzUzULxh8qRGwFwv=f~(8w
z)4n>!^nK@G0kZ|;V5jx{XdJGps!zx0Sd;NKF-uvP1eQAZ%fa8ez53OsV^xM$fn~Lf
zFMv6jbzC~wV&C7dt50Rv_I!!hr3l8sxP99YLDxnDIZ6{njaLXWcw#Rs_TL1iO!<<!
zdUTtbj$dmVUGixDVhnE5c7b!+HUx9(>QEW}vP|Fx1_@JebN`XR!)ZAJ&j_6FH8zP9
zDwTyf(GQ4&r|oo_J&+8a`KJ=83=|~eG@J20bIE~Z!CX>4QU#{9J|b|$!Qld!i8@AP
zfk=+tzDt&43v7xBlLImn^FYZIXvt9)jMj5qc(ksM$RI$1Y%mYziMl=_g91snh4+l6
zz8$!ws*a=$Aa!5{0^(p=1$N-NKuK=USoHvKaE&*5Kg`p%F}Ttu<Ik8N->A@0SRS-Z
z+6*qu8dC+P11r*D{9agWZ9hf>@p*Lu>jRJvt!-o8xUw(;Pg<X2f&8`B_Hj&*9k$Fb
z2W^|nq`GBb9PCS{x&m8m%sbIQG~6&npQRrk^j;`>m+A#0u+EP0^WoOjm9Q0mEE<Tt
z6rMGQUzM>^hl}2{vS9RG%)d|yyyg3j!d=#Ob_nK112Lnwo6*C*Z6D0{2Z6wdo<3Dz
zbOKD~q{`y|TkYMb5C(FqKXM)1mwNa8*>AlLtf>H_V}8<8%YW~}BR<R-f!k@KsI!}r
zsqlHo!O9>FzTjX~<0>^!x20}7-T&$jX&BvF-e(*vaqzwAc$KEgI9wh)aURr5%YW0K
z2pnwlmuF6%k{6pz*kqivexHQ08!7e%HRWN_4|n#$@~nfd88~eRg&Muv!Q(S<SsKO%
zlMYUgz-^5}1jgQ>3caHW+~2RP44+vW*V<wO^d31BY@LxRkJ$;_tzmuaOtWvF(E~tp
z^k7Dh3%t^W2Xx=-J)l1yXzb+RL4g-Eg$??@*b0~+z}w!-(K8(X7YA>I{*bf*CioTV
zAqTqxga2DC`+t}A$%_P%w!q{iMOBidJvB1TR)Mq%rY=ZpU}Au@0wxy7ti!|vX$;0P
z#v?wgk5qpbI1r`?jULTGzR*Z@{|1luHoh_%Vw=)8kHQs1DjLQ(c+U*%_UapDWg>5<
yyj7VjvLlrO9PbCDQ3x~ahcdP(j6&#dC>H@&?Vgge!$Ecc0000<MNUMnLSTa1@h2+)

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/unmute.png b/src/main/webapp/images/unmute.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b932bd0e9bf660e7574ec1b5bf79d2f7f265290
GIT binary patch
literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkR-AP12RCt{2nM-VxRTRg6Bqo3&5JgEO1cZQ)5EFN@bL$3O02_!z
zq$HX^Fc@5zuqkoj1EXD=NZ2U4kn)TnH1ZhQxo6rYv?7?+x45V-giz|EHRs+lGv9QE
zGQ-?&W=Q6r+~oVtckln4bD!s)4`O4G$H}o1M>oP%95;Ol&)xo8KabI}=w&{Rx6SCO
z8B3^hfD1fKOF>wJ@NL4-Q#f9skJSwFkT3eIGRNsey>IAe6)k}rYjON(#$85uwu(0E
z5r(YIn0K<N$nXflh#7Q(A?8)xR_h8Ut?gBW1vCx9hc-n7;lY~Q>y#66#_<kKL5^hz
ze<S=$j;HULC(AQ9{zDii#}hOh!d~mi&mwSrZd|*f*jA(Rv!;Aw1g_1-bvlY|H7ftn
zE7vJjFM4^>7X1hfhhxGkzsBskxs)R~GET!W^T|Dd<An-sUMzILol46&l4V0#8+EQ_
z9f^guBlV)aMrh(15xNjQsyHI?bd>W|(pwiCzxr}F#qk~atxRufj-+{xNGmuJ;~bGj
zIuZ+QM{0rN8p2;CG7a#w7kijPy~r@vrsVBudT;n^a5M-PyrSftTp0DTEGr`LuQW%#
zFG(*2*}1y;6N<j@q{(cD@RiN$Ep_wf*lI?fNyye3{}H0W@uv0u_JT~<ZOXeN@OPWh
zdlLK|CfiFiXo4V+9xccQSmNijW3sAT)=W7r<p^8$(t=z#Zk@M|XqaLa!cPddd@d^w
z$Ghg>6$V&XGq1MMwt?edK`tz^&1A&ujta-?rtrOl!UdLGQ~7ysK(z?Qp10}wT}ekc
zJ}}PLh>nm<8?*dVG2x&aK#;3JKU6%?r$g&#-C*n=WO*v_ZH1q*!u2RydqoJ_%-~E(
z(m@l^j^RY8F@WPO9M4&TdyRiqnSLvVGQ%Z1VGnZ<`t19rbet$UbHo&VQX<!11VX1B
zVt4zkpmjRSa>b6r6}eMESfC+aD;z3I2Zgz>Tjx=~kc&ThbWwkau%m1(=|~ivxL8v%
zJVF+}-+K2F11!I1E?pD(>Ey`x6TP9(9n0})Ax0A3r;kT#XurtsPQ|ePW51y^4UU%(
zelKJS9mo9i(GVl~YfYa+*wJB!T?jfIzxdp5OCaN;*WHCcvUFkR*T{6aM%1rHNx7y1
z4JjP^5=M_C{%UD?!;j2;1DSS%Y+5F<UbG!)HMB>h8Mwq^e==7p`4PF(dwKopuK>}I
z<7GR@rXrWo^rPN9G}#c}f#g9sNtWl+cf>JhO83*l1JQWHZL`aq`8pc!3=02AbwtFM
lpBv#wKIBNR=+&S`{0|nn;avEaC!zoV002ovPDHLkV1hm(`_TXZ

literal 0
HcmV?d00001

diff --git a/src/main/webapp/multitrack-conference.html b/src/main/webapp/multitrack-conference.html
index 3589e1c9..fee88b29 100644
--- a/src/main/webapp/multitrack-conference.html
+++ b/src/main/webapp/multitrack-conference.html
@@ -283,9 +283,6 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 	var roomNameBox = document.getElementById("roomName");
 
 	if (roomId != null) {
-	var roomname = getUrlParameter("roomname");
-	if(roomname != "undefined" && roomname != undefined)
-		roomNameBox.value=roomname;
 	roomNameBox.value = roomId;
 	}
 	
@@ -313,9 +310,9 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 
 	function openInNewTab(){
 		let parrentURL= getUrlParameter("parrentURL")
-		if(parrentURL==null)
+		if(parrentURL==null || parrentURL==undefined)
 			parrentURL=""
-		window.open(parrentURL+"?roomname="+roomNameBox.value );
+		window.open(parrentURL+"?roomname="+roomNameBox.value);
 	}
 
 	function toggleLocalCamera() {

From 1b9b3c06683bbaf14fcb165549fa1c94d0354ed2 Mon Sep 17 00:00:00 2001
From: USAMAWIZARD <usamawizard@gmail.com>
Date: Fri, 24 Nov 2023 17:25:41 +0530
Subject: [PATCH 3/4] add camera mic toggle add open in new tab button

---
 src/main/webapp/multitrack-conference.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/multitrack-conference.html b/src/main/webapp/multitrack-conference.html
index fee88b29..f187bb02 100644
--- a/src/main/webapp/multitrack-conference.html
+++ b/src/main/webapp/multitrack-conference.html
@@ -312,7 +312,7 @@ <h3 class="col text-muted">WebRTC Conference</h3>
 		let parrentURL= getUrlParameter("parrentURL")
 		if(parrentURL==null || parrentURL==undefined)
 			parrentURL=""
-		window.open(parrentURL+"?roomname="+roomNameBox.value);
+		window.open(parrentURL+"?roomId="+roomNameBox.value);
 	}
 
 	function toggleLocalCamera() {

From 78b170e86ed45cef5ad4ee817da706008c71d9e8 Mon Sep 17 00:00:00 2001
From: USAMA <usamawizard@gmail.com>
Date: Sat, 9 Dec 2023 15:48:40 +0530
Subject: [PATCH 4/4] Update redeploy.sh

---
 redeploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redeploy.sh b/redeploy.sh
index 0a1cd419..ac98e87f 100755
--- a/redeploy.sh
+++ b/redeploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-AMS_DIR=/usr/local/antmedia
+AMS_DIR=~/softwares/ant-media-server
 mvn clean install -DskipTests -Dgpg.skip=true
 OUT=$?