Switching the video feedback in Svelte

front/dist/index.tmpl.html

@@ -47,32 +47,6 @@
                     </aside>
                     <div id="chat-mode" class="chat-mode three-col" style="display: none;">
                     </div>
-                    <div id="activeCam" class="activeCam">
-                        <div id="div-myCamVideo" class="video-container">
-                            <video id="myCamVideo" autoplay muted></video>
-                            <div id="mySoundMeter" class="sound-progress">
-                                <span></span>
-                                <span></span>
-                                <span></span>
-                                <span></span>
-                                <span></span>
-                            </div>
-                        </div>
-                    </div>
-<!--                    <div class="btn-cam-action">
-                        <div id="btn-monitor" class="btn-monitor">
-                            <img id="monitor" src="resources/logos/monitor.svg">
-                            <img id="monitor-close" src="resources/logos/monitor-close.svg">
-                        </div>
-                        <div id="btn-video" class="btn-video">
-                            <img id="cinema" src="resources/logos/cinema.svg">
-                            <img id="cinema-close" src="resources/logos/cinema-close.svg">
-                        </div>
-                        <div id="btn-micro" class="btn-micro">
-                            <img id="microphone" src="resources/logos/microphone.svg">
-                            <img id="microphone-close" src="resources/logos/microphone-close.svg">
-                        </div>
-                    </div> -->
                 </div>
             </div>
             <div id="cowebsite" class="cowebsite hidden">

front/src/Components/App.svelte

@@ -3,6 +3,7 @@
     import {menuIconVisible} from "../Stores/MenuStore";
     import {gameOverlayVisibilityStore} from "../Stores/MediaStore";
     import CameraControls from "./CameraControls.svelte";
+    import MyCamera from "./MyCamera.svelte";
 
 </script>
 
@@ -11,6 +12,7 @@
     <!-- {#if $menuIconVisible}
     <MenuIcon  />
     {/if} -->
+        <MyCamera></MyCamera>
         <CameraControls></CameraControls>
     {/if}
 </div>

front/src/Components/MyCamera.svelte

@@ -0,0 +1,46 @@
+<script lang="typescript">
+    import {localStreamStore} from "../Stores/MediaStore";
+    import SoundMeterWidget from "./SoundMeterWidget.svelte";
+    import {onDestroy} from "svelte";
+
+    function srcObject(node, stream) {
+        node.srcObject = stream;
+        return {
+            update(newStream) {
+                if (node.srcObject != newStream) {
+                    node.srcObject = newStream
+                }
+            }
+        }
+    }
+
+    let stream : MediaStream|null;
+    /*$: {
+        if ($localStreamStore.type === 'success') {
+            stream = $localStreamStore.stream;
+        } else {
+            stream = null;
+        }
+    }*/
+
+    const unsubscribe = localStreamStore.subscribe(value => {
+        if (value.type === 'success') {
+            stream = value.stream;
+        } else {
+            stream = null;
+        }
+    });
+
+    onDestroy(unsubscribe);
+
+</script>
+
+
+<div>
+    <div class="video-container div-myCamVideo" class:hide={!$localStreamStore.constraints.video}>
+        <video class="myCamVideo" use:srcObject={$localStreamStore.stream} autoplay muted></video>
+        <!-- {#if stream}
+        <SoundMeterWidget stream={stream}></SoundMeterWidget>
+        {/if} -->
+    </div>
+</div>

front/src/Components/SoundMeterWidget.svelte

@@ -0,0 +1,36 @@
+<script lang="typescript">
+    import {SoundMeter} from "../Phaser/Components/SoundMeter";
+    import {onDestroy} from "svelte";
+
+    export let stream: MediaStream;
+    let volume = 0;
+
+    console.log('stream', stream);
+
+    if (stream.getAudioTracks().length > 0) {
+        const soundMeter = new SoundMeter();
+        soundMeter.connectToSource(stream, new AudioContext());
+
+        const timeout = setInterval(() => {
+            try{
+                volume = parseInt((soundMeter.getVolume() / 10).toFixed(0));
+                console.log(volume);
+            }catch(err){
+
+            }
+        }, 100);
+
+        onDestroy(() => {
+            clearInterval(timeout);
+        })
+    }
+</script>
+
+
+<div class="sound-progress" class:active={stream?.getAudioTracks().length > 0}>
+    <span class:active={volume > 1}></span>
+    <span class:active={volume > 2}></span>
+    <span class:active={volume > 3}></span>
+    <span class:active={volume > 4}></span>
+    <span class:active={volume > 5}></span>
+</div>

front/src/WebRtc/MediaManager.ts

@@ -46,13 +46,6 @@ export class MediaManager {
     localStream: MediaStream|null = null;
     localScreenCapture: MediaStream|null = null;
     private remoteVideo: Map<string, HTMLVideoElement> = new Map<string, HTMLVideoElement>();
-    myCamVideo: HTMLVideoElement;
-    /*cinemaClose: HTMLImageElement;
-    cinema: HTMLImageElement;
-    monitorClose: HTMLImageElement;
-    monitor: HTMLImageElement;
-    microphoneClose: HTMLImageElement;
-    microphone: HTMLImageElement;*/
     webrtcInAudio: HTMLAudioElement;
     //FIX ME SOUNDMETER: check stalability of sound meter calculation
     //mySoundMeterElement: HTMLDivElement;
@@ -63,10 +56,6 @@ export class MediaManager {
     showReportModalCallBacks : Set<ShowReportCallBack> = new Set<ShowReportCallBack>();
     helpCameraSettingsCallBacks : Set<HelpCameraSettingsCallBack> = new Set<HelpCameraSettingsCallBack>();
 
-/*    private microphoneBtn: HTMLDivElement;
-    private cinemaBtn: HTMLDivElement;
-    private monitorBtn: HTMLDivElement;*/
-
     private focused : boolean = true;
 
     private triggerCloseJistiFrame : Map<String, Function> = new Map<String, Function>();
@@ -80,54 +69,11 @@ export class MediaManager {
 
     constructor() {
 
-        this.myCamVideo = HtmlUtils.getElementByIdOrFail<HTMLVideoElement>('myCamVideo');
         this.webrtcInAudio = HtmlUtils.getElementByIdOrFail<HTMLAudioElement>('audio-webrtc-in');
         this.webrtcOutAudio = HtmlUtils.getElementByIdOrFail<HTMLAudioElement>('audio-webrtc-out');
         this.webrtcInAudio.volume = 0.2;
         this.webrtcOutAudio.volume = 0.2;
 
-        /*this.microphoneBtn = HtmlUtils.getElementByIdOrFail<HTMLDivElement>('btn-micro');
-        this.microphoneClose = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('microphone-close');
-        this.microphoneClose.style.display = "none";
-        this.microphoneClose.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            requestedMicrophoneState.enableMicrophone();
-        });
-        this.microphone = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('microphone');
-        this.microphone.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            requestedMicrophoneState.disableMicrophone();
-        });
-
-        this.cinemaBtn = HtmlUtils.getElementByIdOrFail<HTMLDivElement>('btn-video');
-        this.cinemaClose = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('cinema-close');
-        this.cinemaClose.style.display = "none";
-        this.cinemaClose.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            requestedCameraState.enableWebcam();
-        });
-        this.cinema = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('cinema');
-        this.cinema.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            requestedCameraState.disableWebcam();
-        });
-
-        this.monitorBtn = HtmlUtils.getElementByIdOrFail<HTMLDivElement>('btn-monitor');
-        this.monitorClose = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('monitor-close');
-        this.monitorClose.style.display = "block";
-        this.monitorClose.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            //this.enableScreenSharing();
-            requestedScreenSharingState.enableScreenSharing();
-        });
-        this.monitor = HtmlUtils.getElementByIdOrFail<HTMLImageElement>('monitor');
-        this.monitor.style.display = "none";
-        this.monitor.addEventListener('click', (e: MouseEvent) => {
-            e.preventDefault();
-            //this.disableScreenSharing();
-            requestedScreenSharingState.disableScreenSharing();
-        });*/
-
         this.pingCameraStatus();
 
         //FIX ME SOUNDMETER: check stability of sound meter calculation
@@ -148,11 +94,11 @@ export class MediaManager {
                 return;
             }
 
-            if (result.constraints.video !== false) {
+            /*if (result.constraints.video !== false) {
                 HtmlUtils.getElementByIdOrFail('div-myCamVideo').classList.remove('hide');
             } else {
                 HtmlUtils.getElementByIdOrFail('div-myCamVideo').classList.add('hide');
-            }/*
+            }
             if (result.constraints.audio !== false) {
                 this.enableMicrophoneStyle();
             } else {
@@ -160,7 +106,7 @@ export class MediaManager {
             }*/
 
             this.localStream = result.stream;
-            this.myCamVideo.srcObject = this.localStream;
+            //this.myCamVideo.srcObject = this.localStream;
 
             // TODO: migrate all listeners to the store directly.
             this.triggerUpdatedLocalStreamCallbacks(result.stream);

front/style/mobile-style.scss

@@ -1,9 +1,24 @@
+@media (hover: none) {
+  /**
+   * If we cannot hover over elements, let's display camera button in full.
+   */
+  .btn-cam-action {
+    div {
+      transform: translateY(0px);
+    }
+  }
+}
+
 @media screen and (max-width: 700px),
         screen and (max-height: 700px){
-  video#myCamVideo {
+  video.myCamVideo {
     width: 150px;
   }
 
+  .div-myCamVideo.hide {
+    right: -160px;
+  }
+
   .sidebar {
     width: 20%;
     min-width: 200px;
@@ -22,21 +37,6 @@
     }
   }
 
-  .btn-cam-action {
-    min-width: 150px;
-
-    &:hover{
-      transform: translateY(20px);
-    }
-    div {
-      margin: 0 1%;
-      &:hover {
-        background-color: #666;
-      }
-      margin-bottom: 30px;
-    }
-  }
-
   .main-section {
     position: absolute;
     width: 100%;

front/style/style.css

@@ -133,11 +133,11 @@ body .message-info.warning{
     outline: none;
 }
 
-.video-container#div-myCamVideo{
+.video-container.div-myCamVideo{
     border: none;
 }
 
-#div-myCamVideo {
+.div-myCamVideo {
     position: absolute;
     right: 15px;
     bottom: 30px;
@@ -146,11 +146,11 @@ body .message-info.warning{
     transition: right 350ms;
 }
 
-#div-myCamVideo.hide {
+.div-myCamVideo.hide {
     right: -20vw;
 }
 
-video#myCamVideo{
+video.myCamVideo{
     width: 15vw;
     -webkit-transform: scaleX(-1);
     transform: scaleX(-1);