wait for threadsafe function to finish - fixes #59

wouterverweirder · wouterverweirder · commit 1879a00d9bc0 · 2020-05-23T15:47:55.000+02:00
diff --git a/examples/electron/renderer/demo-preload.js b/examples/electron/renderer/demo-preload.js
@@ -2,8 +2,9 @@ const { ipcRenderer } = require('electron');
 ipcRenderer.on('close-kinect', (event, message) => {
   if (window.kinect) {
     // properly close the kinect and send a message back to the renderer
-    window.kinect.close();
-    event.sender.send('kinect closed');
+    window.kinect.close().then(() => {
+      event.sender.send('kinect closed');
+    });
   } else {
     event.sender.send('kinect closed');
   }
diff --git a/examples/electron/renderer/demos/color-reader.html b/examples/electron/renderer/demos/color-reader.html
@@ -37,15 +37,15 @@ <h1 class="bd-title">Color Stream</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openColorReader();
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeColorReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeColorReader();
             }
           }
         }
diff --git a/examples/electron/renderer/demos/depth-reader.html b/examples/electron/renderer/demos/depth-reader.html
@@ -37,15 +37,15 @@ <h1 class="bd-title">Depth Stream</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openDepthReader();
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeDepthReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeDepthReader();
             }
           }
         }
diff --git a/examples/electron/renderer/demos/infrared-reader.html b/examples/electron/renderer/demos/infrared-reader.html
@@ -37,15 +37,15 @@ <h1 class="bd-title">Infrared Stream</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openInfraredReader();
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeInfraredReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeInfraredReader();
             }
           }
         }
diff --git a/examples/electron/renderer/demos/long-exposure-infrared-reader.html b/examples/electron/renderer/demos/long-exposure-infrared-reader.html
@@ -37,15 +37,15 @@ <h1 class="bd-title">Long Exposure Infrared Stream</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openLongExposureInfraredReader();
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeLongExposureInfraredReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeLongExposureInfraredReader();
             }
           }
         }
diff --git a/examples/electron/renderer/demos/multi-source-reader.html b/examples/electron/renderer/demos/multi-source-reader.html
@@ -50,17 +50,17 @@ <h1 class="bd-title">Multi Source Stream</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openMultiSourceReader({
                 frameTypes: Kinect2.FrameType.color | Kinect2.FrameType.depth | Kinect2.FrameType.body
               });
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeMultiSourceReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeMultiSourceReader();
             }
           }
         }
diff --git a/examples/electron/renderer/demos/skeletons.html b/examples/electron/renderer/demos/skeletons.html
@@ -50,15 +50,15 @@ <h1 class="bd-title">Skeletons</h1>
           startKinect();
         };
 
-        const setFeedOpen = (value) => {
+        const setFeedOpen = async (value) => {
           if(value !== feedOpen) {
             feedOpen = value;
             if(feedOpen) {
-              $toggleFeedButton.textContent = 'Stop Video';
               kinect.openBodyReader();
+              $toggleFeedButton.textContent = 'Stop Video';
             } else {
+              await kinect.closeBodyReader();
               $toggleFeedButton.textContent = 'Start Video';
-              kinect.closeBodyReader();
             }
           }
         }
diff --git a/examples/node/restart-multiple-times-body.js b/examples/node/restart-multiple-times-body.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openBodyReader();
+    console.log("started body reader");
+    await kinect.closeBodyReader();
+    console.log("stopped body reader");
+
+    kinect.openBodyReader();
+    console.log("started body reader");
+    await kinect.closeBodyReader();
+    console.log("stopped body reader");
+
+    // you can also us the then() keyword
+    kinect.openBodyReader();
+    console.log("started body reader");
+    kinect.closeBodyReader().then(() => {
+      console.log("stopped body reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeBodyReader((err, result) => {
+        console.log("stopped body reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-color.js b/examples/node/restart-multiple-times-color.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openColorReader();
+    console.log("started color reader");
+    await kinect.closeColorReader();
+    console.log("stopped color reader");
+
+    kinect.openColorReader();
+    console.log("started color reader");
+    await kinect.closeColorReader();
+    console.log("stopped color reader");
+
+    // you can also us the then() keyword
+    kinect.openColorReader();
+    console.log("started color reader");
+    kinect.closeColorReader().then(() => {
+      console.log("stopped color reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeColorReader((err, result) => {
+        console.log("stopped color reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-depth.js b/examples/node/restart-multiple-times-depth.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openDepthReader();
+    console.log("started depth reader");
+    await kinect.closeDepthReader();
+    console.log("stopped depth reader");
+
+    kinect.openDepthReader();
+    console.log("started depth reader");
+    await kinect.closeDepthReader();
+    console.log("stopped depth reader");
+
+    // you can also us the then() keyword
+    kinect.openDepthReader();
+    console.log("started depth reader");
+    kinect.closeDepthReader().then(() => {
+      console.log("stopped depth reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeDepthReader((err, result) => {
+        console.log("stopped depth reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-infrared.js b/examples/node/restart-multiple-times-infrared.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openInfraredReader();
+    console.log("started infrared reader");
+    await kinect.closeInfraredReader();
+    console.log("stopped infrared reader");
+
+    kinect.openInfraredReader();
+    console.log("started infrared reader");
+    await kinect.closeInfraredReader();
+    console.log("stopped infrared reader");
+
+    // you can also us the then() keyword
+    kinect.openInfraredReader();
+    console.log("started infrared reader");
+    kinect.closeInfraredReader().then(() => {
+      console.log("stopped infrared reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeInfraredReader((err, result) => {
+        console.log("stopped infrared reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-long-exposure-infrared.js b/examples/node/restart-multiple-times-long-exposure-infrared.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openLongExposureInfraredReader();
+    console.log("started long exposure infrared reader");
+    await kinect.closeLongExposureInfraredReader();
+    console.log("stopped long exposure infrared reader");
+
+    kinect.openLongExposureInfraredReader();
+    console.log("started long exposure infrared reader");
+    await kinect.closeLongExposureInfraredReader();
+    console.log("stopped long exposure infrared reader");
+
+    // you can also us the then() keyword
+    kinect.openLongExposureInfraredReader();
+    console.log("started long exposure infrared reader");
+    kinect.closeLongExposureInfraredReader().then(() => {
+      console.log("stopped long exposure infrared reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeLongExposureInfraredReader((err, result) => {
+        console.log("stopped long exposure infrared reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-multisource.js b/examples/node/restart-multiple-times-multisource.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openMultiSourceReader({ frameTypes: Kinect2.FrameType.color | Kinect2.FrameType.depth | Kinect2.FrameType.body });
+    console.log("started multi source reader");
+    await kinect.closeMultiSourceReader();
+    console.log("stopped multi source reader");
+
+    kinect.openMultiSourceReader({ frameTypes: Kinect2.FrameType.color | Kinect2.FrameType.depth | Kinect2.FrameType.body });
+    console.log("started multi source reader");
+    await kinect.closeMultiSourceReader();
+    console.log("stopped multi source reader");
+
+    // you can also us the then() keyword
+    kinect.openMultiSourceReader({ frameTypes: Kinect2.FrameType.color | Kinect2.FrameType.depth | Kinect2.FrameType.body });
+    console.log("started multi source reader");
+    kinect.closeMultiSourceReader().then(() => {
+      console.log("stopped multi source reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeMultiSourceReader((err, result) => {
+        console.log("stopped multi source reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/examples/node/restart-multiple-times-rawdepth.js b/examples/node/restart-multiple-times-rawdepth.js
@@ -0,0 +1,33 @@
+const Kinect2 = require('kinect2');
+const kinect = new Kinect2();
+
+// execute as an async function, so we can use the await keyword
+const main = async () => {
+  if(kinect.open()) {
+    console.log("Kinect Opened");
+    kinect.openRawDepthReader();
+    console.log("started raw depth reader");
+    await kinect.closeRawDepthReader();
+    console.log("stopped raw depth reader");
+
+    kinect.openRawDepthReader();
+    console.log("started raw depth reader");
+    await kinect.closeRawDepthReader();
+    console.log("stopped raw depth reader");
+
+    // you can also us the then() keyword
+    kinect.openRawDepthReader();
+    console.log("started raw depth reader");
+    kinect.closeRawDepthReader().then(() => {
+      console.log("stopped raw depth reader");
+
+      // or use an old-school callback to wait for the kinect to finish cleaning up
+      kinect.closeRawDepthReader((err, result) => {
+        console.log("stopped raw depth reader");
+        kinect.close();
+      });
+    });
+  }
+};
+
+main();
diff --git a/lib/kinect2.js b/lib/kinect2.js
diff --git a/package.json b/package.json
diff --git a/src/kinect2.cc b/src/kinect2.cc

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ <h1 class="bd-title">Color Stream</h1>`
`37`	`37`	`startKinect();`
`38`	`38`	`};`
`39`	`39`
`40`		`- const setFeedOpen = (value) => {`
	`40`	`+ const setFeedOpen = async (value) => {`
`41`	`41`	`if(value !== feedOpen) {`
`42`	`42`	`feedOpen = value;`
`43`	`43`	`if(feedOpen) {`
`44`		`- $toggleFeedButton.textContent = 'Stop Video';`
`45`	`44`	`kinect.openColorReader();`
	`45`	`+ $toggleFeedButton.textContent = 'Stop Video';`
`46`	`46`	`} else {`
	`47`	`+ await kinect.closeColorReader();`
`47`	`48`	`$toggleFeedButton.textContent = 'Start Video';`
`48`		`- kinect.closeColorReader();`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ <h1 class="bd-title">Skeletons</h1>`
`50`	`50`	`startKinect();`
`51`	`51`	`};`
`52`	`52`
`53`		`- const setFeedOpen = (value) => {`
	`53`	`+ const setFeedOpen = async (value) => {`
`54`	`54`	`if(value !== feedOpen) {`
`55`	`55`	`feedOpen = value;`
`56`	`56`	`if(feedOpen) {`
`57`		`- $toggleFeedButton.textContent = 'Stop Video';`
`58`	`57`	`kinect.openBodyReader();`
	`58`	`+ $toggleFeedButton.textContent = 'Stop Video';`
`59`	`59`	`} else {`
	`60`	`+ await kinect.closeBodyReader();`
`60`	`61`	`$toggleFeedButton.textContent = 'Start Video';`
`61`		`- kinect.closeBodyReader();`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`