guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [4/7] incubator-guacamole-client git commit: GUACAMOLE-25: Add onclose/onerror handlers to Guacamole.AudioRecorder.
Date Tue, 24 May 2016 04:27:57 GMT
GUACAMOLE-25: Add onclose/onerror handlers to Guacamole.AudioRecorder.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/c32a7798
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/c32a7798
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/c32a7798

Branch: refs/heads/master
Commit: c32a779825732a27f130e26bc73aa5f60566608c
Parents: d0533d0
Author: Michael Jumper <mjumper@apache.org>
Authored: Mon May 2 00:12:23 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Mon May 23 21:08:54 2016 -0700

----------------------------------------------------------------------
 .../src/main/webapp/modules/AudioRecorder.js    | 137 ++++++++++++++-----
 1 file changed, 106 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c32a7798/guacamole-common-js/src/main/webapp/modules/AudioRecorder.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/AudioRecorder.js b/guacamole-common-js/src/main/webapp/modules/AudioRecorder.js
index 43394e5..306acbd 100644
--- a/guacamole-common-js/src/main/webapp/modules/AudioRecorder.js
+++ b/guacamole-common-js/src/main/webapp/modules/AudioRecorder.js
@@ -29,7 +29,26 @@ var Guacamole = Guacamole || {};
  */
 Guacamole.AudioRecorder = function AudioRecorder() {
 
-    // AudioRecorder currently provides no functions
+    /**
+     * Callback which is invoked when the audio recording process has stopped
+     * and the underlying Guacamole stream has been closed normally. Audio will
+     * only resume recording if a new Guacamole.AudioRecorder is started. This
+     * Guacamole.AudioRecorder instance MAY NOT be reused.
+     *
+     * @event
+     */
+    this.onclose = null;
+
+    /**
+     * Callback which is invoked when the audio recording process cannot
+     * continue due to an error, if it has started at all. The underlying
+     * Guacamole stream is automatically closed. Future attempts to record
+     * audio should not be made, and this Guacamole.AudioRecorder instance
+     * MAY NOT be reused.
+     *
+     * @event
+     */
+    this.onerror = null;
 
 };
 
@@ -115,6 +134,14 @@ Guacamole.AudioRecorder.getInstance = function getInstance(stream, mimetype)
{
 Guacamole.RawAudioRecorder = function RawAudioRecorder(stream, mimetype) {
 
     /**
+     * Reference to this RawAudioRecorder.
+     *
+     * @private
+     * @type {Guacamole.RawAudioRecorder}
+     */
+    var recorder = this;
+
+    /**
      * The size of audio buffer to request from the Web Audio API when
      * recording or processing audio, in sample-frames. This must be a power of
      * two between 256 and 16384 inclusive, as required by
@@ -380,36 +407,16 @@ Guacamole.RawAudioRecorder = function RawAudioRecorder(stream, mimetype)
{
 
     };
 
-    // Once audio stream is successfully open, request and begin reading audio
-    writer.onack = function audioStreamAcknowledged(status) {
-
-        // Abort stream if rejected
-        if (status.code !== Guacamole.Status.Code.SUCCESS) {
-
-            // Disconnect media source node from script processor
-            if (source)
-                source.disconnect();
-
-            // Disconnect associated script processor node
-            if (processor)
-                processor.disconnect();
-
-            // Stop capture
-            if (mediaStream) {
-                var tracks = mediaStream.getTracks();
-                for (var i = 0; i < tracks.length; i++)
-                    tracks[i].stop();
-            }
-
-            // Remove references to now-unneeded components
-            processor = null;
-            source = null;
-            mediaStream = null;
-
-            writer.sendEnd();
-            return;
-
-        }
+    /**
+     * Requests access to the user's microphone and begins capturing audio. All
+     * received audio data is resampled as necessary and forwarded to the
+     * Guacamole stream underlying this Guacamole.RawAudioRecorder. This
+     * function must be invoked ONLY ONCE per instance of
+     * Guacamole.RawAudioRecorder.
+     *
+     * @private
+     */
+    var beginAudioCapture = function beginAudioCapture() {
 
         // Attempt to retrieve an audio input stream from the browser
         getUserMedia({ 'audio' : true }, function streamReceived(stream) {
@@ -435,10 +442,78 @@ Guacamole.RawAudioRecorder = function RawAudioRecorder(stream, mimetype)
{
             // Simply end stream if audio access is not allowed
             writer.sendEnd();
 
+            // Notify of closure
+            if (recorder.onerror)
+                recorder.onerror();
+
         });
 
     };
 
+    /**
+     * Stops capturing audio, if the capture has started, freeing all associated
+     * resources. If the capture has not started, this function simply ends the
+     * underlying Guacamole stream.
+     *
+     * @private
+     */
+    var stopAudioCapture = function stopAudioCapture() {
+
+        // Disconnect media source node from script processor
+        if (source)
+            source.disconnect();
+
+        // Disconnect associated script processor node
+        if (processor)
+            processor.disconnect();
+
+        // Stop capture
+        if (mediaStream) {
+            var tracks = mediaStream.getTracks();
+            for (var i = 0; i < tracks.length; i++)
+                tracks[i].stop();
+        }
+
+        // Remove references to now-unneeded components
+        processor = null;
+        source = null;
+        mediaStream = null;
+
+        // End stream
+        writer.sendEnd();
+
+    };
+
+    // Once audio stream is successfully open, request and begin reading audio
+    writer.onack = function audioStreamAcknowledged(status) {
+
+        // Begin capture if successful response and not yet started
+        if (status.code === Guacamole.Status.Code.SUCCESS && !mediaStream)
+            beginAudioCapture();
+
+        // Otherwise stop capture and cease handling any further acks
+        else {
+
+            // Stop capturing audio
+            stopAudioCapture();
+            writer.onack = null;
+
+            // Notify if stream has closed normally
+            if (status.code === Guacamole.Status.Code.RESOURCE_CLOSED) {
+                if (recorder.onclose)
+                    recorder.onclose();
+            }
+
+            // Otherwise notify of closure due to error
+            else {
+                if (recorder.onerror)
+                    recorder.onerror();
+            }
+
+        }
+
+    };
+
 };
 
 Guacamole.RawAudioRecorder.prototype = new Guacamole.AudioRecorder();


Mime
View raw message