@grame/faustwasm 0.7.10 → 0.8.2

package/src/FaustScriptProcessorNode.ts

@@ -50,25 +50,12 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
 
     // Public API
 
-    /** Setup accelerometer and gyroscope handlers */
+    /** Start accelerometer and gyroscope handlers */
     async startSensors() {
         if (this.hasAccInput) {
             if (window.DeviceMotionEvent) {
-                if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
-                    try {
-                        const response = await (window.DeviceMotionEvent as any).requestPermission();
-                        if (response === "granted") {
-                            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-                        } else if (response === "denied") {
-                            alert('You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.');
-                            throw new Error("Unable to access the accelerometer.");
-                        }
-                    } catch (error) {
-                        console.error(error);
-                    }
-                } else {
-                    window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-                }
+                // iOS 13+ requires a user gesture to enable DeviceMotionEvent, to be done in the main thread
+                window.addEventListener("devicemotion", this.handleDeviceMotion, true);
             } else {
                 // Browser doesn't support DeviceMotionEvent
                 console.log("Cannot set the accelerometer handler.");
@@ -76,21 +63,8 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
         }
         if (this.hasGyrInput) {
             if (window.DeviceMotionEvent) {
-                if (typeof (window.DeviceOrientationEvent as any).requestPermission === "function") { // for iOS 13+
-                    try {
-                        const response = await (window.DeviceOrientationEvent as any).requestPermission();
-                        if (response === "granted") {
-                            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-                        } else if (response === "denied") {
-                            alert('You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.');
-                            throw new Error("Unable to access the gyroscope.");
-                        }
-                    } catch (error) {
-                        console.error(error);
-                    }
-                } else {
-                    window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-                }
+                // iOS 13+ requires a user gesture to enable DeviceMotionEvent, to be done in the main thread
+                window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
             } else {
                 // Browser doesn't support DeviceMotionEvent
                 console.log("Cannot set the gyroscope handler.");
@@ -98,6 +72,7 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
         }
     }
 
+    /** Stop accelerometer and gyroscope handlers */
     stopSensors() {
         if (this.hasAccInput) {
             window.removeEventListener("devicemotion", this.handleDeviceMotion, true);
@@ -143,11 +118,13 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     destroy() { this.fDSPCode.destroy(); }
 
     get hasAccInput() { return this.fDSPCode.hasAccInput; }
+
     propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
         this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
     }
 
     get hasGyrInput() { return this.fDSPCode.hasGyrInput; }
+
     propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">) {
         this.fDSPCode.propagateGyr(event);
     }

package/src/FaustWebAudioDsp.ts

@@ -496,6 +496,35 @@ export interface IFaustBaseWebAudioDsp {
      */
     getJSON(): string;
 
+    /**
+    * Start accelerometer and gyroscope handlers.
+    */
+    startSensors(): void;
+
+    /**
+     * Stop accelerometer and gyroscope handlers.
+     */
+    stopSensors(): void;
+
+    /** Indicating if the DSP handles the accelerometer */
+    readonly hasAccInput: boolean;
+
+    /** 
+     * Accelerometer handling.
+     * accelerationIncludingGravity: DeviceMotionEvent["accelerationIncludingGravity"]
+     * invert: boolean
+     */
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
+
+    /** Indicating if the DSP handles the gyroscope */
+    readonly hasGyrInput: boolean;
+
+    /** 
+     * Gyroscope handling.
+     * event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">
+     */
+    propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
+
     /**
      * Start the DSP audio processing. 
      */
@@ -510,16 +539,6 @@ export interface IFaustBaseWebAudioDsp {
      * Destroy the DSP.
      */
     destroy(): void;
-
-    /** Indicating if the DSP handles the accelerometer */
-    readonly hasAccInput: boolean;
-    /** Accelerometer handling */
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
-
-    /** Indicating if the DSP handles the gyroscope */
-    readonly hasGyrInput: boolean;
-    /** Gyroscope handling */
-    propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 }
 
 export interface IFaustMonoWebAudioDsp extends IFaustBaseWebAudioDsp { }
@@ -984,6 +1003,14 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 
     hasSoundfiles() { return this.fSoundfiles.length > 0; }
 
+    startSensors(): void {
+        this.startSensors();
+    }
+
+    stopSensors(): void {
+        this.stopSensors();
+    }
+
     start() {
         this.fProcessing = true;
     }
@@ -998,6 +1025,7 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         this.fComputeHandler = null;
         this.fPlotHandler = null;
     }
+
 }
 
 export class FaustMonoWebAudioDsp extends FaustBaseWebAudioDsp implements IFaustMonoWebAudioDsp {

package/test/faustlive-wasm/faust-ui/index.js

@@ -946,10 +946,10 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
     if (!metaIn) return { metaObject };
     metaIn.forEach((m) => Object.assign(metaObject, m));
     if (metaObject.style) {
-      const enumsRegex = /\{(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+?);)+(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+?))\}/;
+      const enumsRegex = /\{(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+);)+(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+))\}/;
       const matched = metaObject.style.match(enumsRegex);
       if (matched) {
-        const itemsRegex = /(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+?))/g;
+        const itemsRegex = /(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+))/g;
         const enums = {};
         let item;
         while (item = itemsRegex.exec(matched[0])) {