emscripten fix audio input to use mediaDevices closes #7638 (#7639)

#changelog #emscripten

Author: ofTheo

addons/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js

@@ -202,55 +202,47 @@ var LibraryHTML5Audio = {
     },
 
     html5audio_stream_create: function(bufferSize, inputChannels, outputChannels, inbuffer, outbuffer, callback, userData) {
-        var stream = AUDIO.context.createScriptProcessor(bufferSize, inputChannels, outputChannels);
-        var inbufferArray = Module.HEAPF32.subarray(inbuffer >> 2,(inbuffer>>2) + bufferSize * inputChannels);
-        var outbufferArray = Module.HEAPF32.subarray(outbuffer >> 2, (outbuffer>>2) + bufferSize * outputChannels);
-
-        stream.onaudioprocess = function(event) {
-            var i, j, c;
-            if (inputChannels > 0) {
-                for (c = 0; c < inputChannels; ++c) {
-                    var inChannel = event.inputBuffer.getChannelData(c);
-                    for (i = 0, j = c; i < bufferSize; ++i, j += inputChannels) {
-                        inbufferArray[j] = inChannel[i];
+            var stream = AUDIO.context.createScriptProcessor(bufferSize, inputChannels, outputChannels);
+            var inbufferArray = Module.HEAPF32.subarray(inbuffer >> 2, (inbuffer >> 2) + bufferSize * inputChannels);
+            var outbufferArray = Module.HEAPF32.subarray(outbuffer >> 2, (outbuffer >> 2) + bufferSize * outputChannels);
+
+            stream.onaudioprocess = function(event) {
+                var i, j, c;
+                if (inputChannels > 0) {
+                    for (c = 0; c < inputChannels; ++c) {
+                        var inChannel = event.inputBuffer.getChannelData(c);
+                        for (i = 0, j = c; i < bufferSize; ++i, j += inputChannels) {
+                            inbufferArray[j] = inChannel[i];
+                        }
                     }
                 }
-            }
 
-            {{{ makeDynCall('viiii', 'callback') }}}(bufferSize, inputChannels, outputChannels, userData);
+                {{{ makeDynCall('viiii', 'callback') }}}(bufferSize, inputChannels, outputChannels, userData);
 
-            if (outputChannels > 0) {
-                for (c = 0; c < outputChannels; ++c) {
-                    var outChannel = event.outputBuffer.getChannelData(c);
-                    for (i = 0, j = c; i<bufferSize; ++i, j += outputChannels) {
-                        outChannel[i] = outbufferArray[j];
+                if (outputChannels > 0) {
+                    for (c = 0; c < outputChannels; ++c) {
+                        var outChannel = event.outputBuffer.getChannelData(c);
+                        for (i = 0, j = c; i < bufferSize; ++i, j += outputChannels) {
+                            outChannel[i] = outbufferArray[j];
+                        }
                     }
                 }
-            }
-        };
+            };
 
-        if (inputChannels > 0) {
-            navigator.getUserMedia = navigator.getUserMedia ||
-            navigator.webkitGetUserMedia ||
-            navigator.mozGetUserMedia ||
-            navigator.msGetUserMedia;
-            
-	    if (navigator.getUserMedia) {
-                navigator.getUserMedia(
-                {audio: true},
-                function (audioIn){
-                    var mediaElement = AUDIO.context.createMediaStreamSource(audioIn);
-                    mediaElement.connect(stream);
-                    AUDIO.mediaElement = mediaElement;
-                },
-                function (error){
-                    console.log("error creating audio in",error);
-                });
-	    }
-        }
+            if (inputChannels > 0) {
+                navigator.mediaDevices.getUserMedia({ audio: true })
+                    .then(function (audioIn) {
+                        var mediaElement = AUDIO.context.createMediaStreamSource(audioIn);
+                        mediaElement.connect(stream);
+                        AUDIO.mediaElement = mediaElement;
+                    })
+                    .catch(function (error) {
+                        console.log("Error creating audio in", error);
+                    });
+            }
 
-        stream.connect(AUDIO.fft);
-    },
+            stream.connect(AUDIO.fft);
+        },
 
     html5audio_stream_free: function () {