From f19ae793c0f2a3ab4c53e26889f1043098e22f2a Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf37@gmail.com>
Date: Wed, 4 Apr 2018 14:20:13 -0400
Subject: [PATCH] enableVideo - get rid of "requests"

---
 .../scratch3_video_sensing/index.js           |  2 +-
 src/io/video.js                               | 35 +++----------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/extensions/scratch3_video_sensing/index.js b/src/extensions/scratch3_video_sensing/index.js
index 145a204d4..5fca73e53 100644
--- a/src/extensions/scratch3_video_sensing/index.js
+++ b/src/extensions/scratch3_video_sensing/index.js
@@ -345,7 +345,7 @@ class Scratch3VideoSensingBlocks {
         if (args.VIDEO_STATE === 'off' || state === 1) {
             this.runtime.ioDevices.video.disableVideo();
         } else {
-            this.runtime.ioDevices.video.requestVideo();
+            this.runtime.ioDevices.video.enableVideo();
             this.runtime.ioDevices.video.mirror = args.VIDEO_STATE === 'on' || state === 2;
         }
     }
diff --git a/src/io/video.js b/src/io/video.js
index 545902f4e..da7e462d9 100644
--- a/src/io/video.js
+++ b/src/io/video.js
@@ -20,12 +20,6 @@ class Video {
          */
         this._frameCacheTimeout = 16;
 
-        /**
-         * Store each request for video, so when all are released we can disable preview/video feed.
-         * @type Array.<object>
-         */
-        this._requests = [];
-
         /**
          * DOM Video element
          * @private
@@ -93,36 +87,15 @@ class Video {
      * Request video be enabled.  Sets up video, creates video skin and enables preview.
      *
      * ioDevices.video.requestVideo()
-     *   .then(({ release }) => {
-     *     this.releaseVideo = release;
-     *   })
      *
-     * @return {Promise.<VideoRequest>} A request object with a "release" property that
-     *      should be called when you are done with the video.
+     * @return {Promise.<Video>} resolves a promise to this IO device when video is ready.
      */
-    requestVideo () {
-        const io = this;
-        const request = {
-            release () {
-                const index = io._requests.indexOf(request);
-                if (index > -1) {
-                    io._requests.splice(index, 1);
-                }
-                if (io._requests.length === 0) {
-                    io._disableVideo();
-                }
-            }
-        };
-
+    enableVideo () {
         if (this.videoReady) {
-            this._requests.push(request);
-            return Promise.resolve(request);
+            return Promise.resolve(this);
         }
 
-        return this._setupVideo().then(() => {
-            this._requests.push(request);
-            return request;
-        });
+        return this._setupVideo().then(() => this);
     }
 
     /**