https://github.com/muaz-khan/RecordRTC/issues/532

muaz-khan · Jun 18, 2019 · 953e777 · 953e777
1 parent bd6e9a6
commit 953e777
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 21 deletions.
diff --git a/MultiStreamsMixer.js b/MultiStreamsMixer.js
@@ -1,7 +1,7 @@
-// Last time updated: 2019-06-15 1:07:23 AM UTC
+// Last time updated: 2019-06-18 3:19:53 AM UTC
 
 // ________________________
-// MultiStreamsMixer v1.2.0
+// MultiStreamsMixer v1.2.1
 
 // Open-Sourced: https://github.com/muaz-khan/MultiStreamsMixer
 
@@ -15,6 +15,10 @@ function MultiStreamsMixer(arrayOfMediaStreams, elementClass) {
     var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko) Fake/12.3.4567.89 Fake/123.45';
 
     (function(that) {
+        if (typeof RecordRTC !== 'undefined') {
+            return;
+        }
+
         if (!that) {
             return;
         }
@@ -550,12 +554,14 @@ function MultiStreamsMixer(arrayOfMediaStreams, elementClass) {
 
 }
 
-if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
-    module.exports = MultiStreamsMixer;
-}
+if (typeof RecordRTC === 'undefined') {
+    if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
+        module.exports = MultiStreamsMixer;
+    }
 
-if (typeof define === 'function' && define.amd) {
-    define('MultiStreamsMixer', [], function() {
-        return MultiStreamsMixer;
-    });
+    if (typeof define === 'function' && define.amd) {
+        define('MultiStreamsMixer', [], function() {
+            return MultiStreamsMixer;
+        });
+    }
 }
diff --git a/MultiStreamsMixer.min.js b/MultiStreamsMixer.min.js
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "multistreamsmixer",
     "description": "Pass multiple streams (e.g. screen+camera or multiple-cameras) and get single stream.",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "authors": [
         {
             "name": "Muaz Khan",

diff --git a/dev/amd.js b/dev/amd.js
@@ -1,6 +1,10 @@
 var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko) Fake/12.3.4567.89 Fake/123.45';
 
 (function(that) {
+    if (typeof RecordRTC !== 'undefined') {
+        return;
+    }
+
     if (!that) {
         return;
     }

diff --git a/dev/tail.js b/dev/tail.js
@@ -8,12 +8,14 @@ this.getMixedStream = getMixedStream;
 
 }
 
-if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
-    module.exports = MultiStreamsMixer;
-}
+if (typeof RecordRTC === 'undefined') {
+    if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
+        module.exports = MultiStreamsMixer;
+    }
 
-if (typeof define === 'function' && define.amd) {
-    define('MultiStreamsMixer', [], function() {
-        return MultiStreamsMixer;
-    });
+    if (typeof define === 'function' && define.amd) {
+        define('MultiStreamsMixer', [], function() {
+            return MultiStreamsMixer;
+        });
+    }
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "multistreamsmixer",
   "preferGlobal": true,
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": {
     "name": "Muaz Khan",
     "email": "[email protected]",