Add sound with screenrecorder

QVDev · Sep 19, 2019 · 75b2cc4 · 75b2cc4
1 parent 2292d20
commit 75b2cc4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/index.html b/index.html
@@ -5,10 +5,10 @@
   <meta charset="utf-8">
   <title></title>
   <script src="https://cdn.jsdelivr.net/npm/gun/gun.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].7/js/GunRecorder.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].7/js/GunStreamer.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].7/js/GunViewer.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].7/js/mediabuffer.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].8/js/GunRecorder.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].8/js/GunStreamer.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].8/js/GunViewer.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].8/js/mediabuffer.js"></script>
 </head>
 
 <body>
@@ -22,7 +22,7 @@
   <br>
   Viewer<br>
   <video id="remote" width="20%" autoplay muted></video>
-  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].7/js/integration.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/QVDev/[email protected].8/js/integration.js"></script>
 </body>
 
 </html>
diff --git a/js/GunRecorder.js b/js/GunRecorder.js
@@ -76,9 +76,13 @@ class GunRecorder {
     }
     var gunRecorder = this;
     if (navigator.mediaDevices.getDisplayMedia && navigator.mediaDevices.getDisplayMedia) {
-      navigator.mediaDevices.getDisplayMedia(this.cameraOptions).then(function (stream) {
-        gunRecorder.video.srcObject = stream;
-        gunRecorder.video.play();
+      navigator.mediaDevices.getDisplayMedia(this.cameraOptions).then(function (desktopStream) {
+        navigator.mediaDevices.getUserMedia({ video: false, audio: true }).then(function (voiceStream) {
+          let tracks = [desktopStream.getVideoTracks()[0], voiceStream.getAudioTracks()[0]]
+          var stream = new MediaStream(tracks);
+          gunRecorder.video.srcObject = stream;
+          gunRecorder.video.play();
+        });
       });
       this.setRecordingState(recordSate.STOPPED);
     } else {