pixi-live2d-display-advanced 0.5.1 → 0.5.3

package/dist/cubism2.es.js

@@ -78,7 +78,7 @@ const config = {
   preserveExpressionOnMotion: true,
   cubism4: CubismConfig
 };
-const VERSION = "v0.5.1";
+const VERSION = "v0.5.3";
 const logger = {
   log(tag, ...messages) {
     if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -3710,11 +3710,10 @@ class SoundManager {
   /**
    * Creates an audio element and adds it to the {@link audios}.
    * @param file - URL of the sound file.
-   * @param onFinish - Callback invoked when the playback has finished.
    * @param onError - Callback invoked when error occurs.
    * @return Created audio element.
    */
-  static add(file, onFinish, onError) {
+  static add(file, onError) {
     return __async(this, null, function* () {
       try {
         const task = new Promise((resolve, reject) => {
@@ -3722,15 +3721,10 @@ class SoundManager {
             url: file,
             volume: this._volume,
             preload: true,
-            complete: () => {
-              this.dispose(audio);
-              onFinish == null ? void 0 : onFinish();
-            },
             loaded: () => {
               if (!(audio.media instanceof webaudio.WebAudioMedia)) {
                 reject(new Error(`Error: ${file} is not WebAudioMedia`));
               }
-              debugger;
               resolve(audio);
             }
           });
@@ -3746,9 +3740,15 @@ class SoundManager {
   /**
    * Plays the sound.
    * @param audio - An audio element.
+   * @param onFinish - Callback invoked when the playback has finished.
    */
-  static play(audio) {
-    audio.play();
+  static play(audio, onFinish) {
+    audio.play({
+      complete: () => {
+        onFinish == null ? void 0 : onFinish();
+        audio.destroy();
+      }
+    });
   }
   static addAnalyzer(audio, context) {
     const media = audio.media;
@@ -4017,25 +4017,14 @@ class MotionManager extends utils$1.EventEmitter {
       const file = sound;
       if (file) {
         try {
-          audio = yield SoundManager.add(
-            file,
-            (that = this) => {
-              logger.warn(this.tag, "Audio finished playing");
-              onFinish == null ? void 0 : onFinish();
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
-            },
-            (e, that = this) => {
-              logger.error(this.tag, "Error during audio playback:", e);
-              onError == null ? void 0 : onError(e);
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
+          audio = yield SoundManager.add(file, (e, that = this) => {
+            logger.error(this.tag, "Error during audio playback:", e);
+            onError == null ? void 0 : onError(e);
+            if (resetExpression && expression && that.expressionManager) {
+              that.expressionManager.resetExpression();
             }
-          );
+            that.currentAudio = void 0;
+          });
           this.initializeAudio(audio, volume);
         } catch (e) {
           logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4046,7 +4035,13 @@ class MotionManager extends utils$1.EventEmitter {
         let playSuccess = true;
         try {
           if (config.motionSync) {
-            SoundManager.play(audio);
+            SoundManager.play(audio, () => {
+              onFinish == null ? void 0 : onFinish();
+              if (resetExpression && expression && this.expressionManager) {
+                this.expressionManager.resetExpression();
+              }
+              this.currentAudio = void 0;
+            });
           }
         } catch (e) {
           logger.warn(this.tag, "Failed to play audio", audio.url, e);
@@ -4124,24 +4119,14 @@ class MotionManager extends utils$1.EventEmitter {
       const file = soundURL;
       if (file) {
         try {
-          audio = yield SoundManager.add(
-            file,
-            (that = this) => {
-              onFinish == null ? void 0 : onFinish();
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
-            },
-            (e, that = this) => {
-              logger.error(this.tag, "Error during audio playback:", e);
-              onError == null ? void 0 : onError(e);
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
+          audio = yield SoundManager.add(file, (e, that = this) => {
+            logger.error(this.tag, "Error during audio playback:", e);
+            onError == null ? void 0 : onError(e);
+            if (resetExpression && expression && that.expressionManager) {
+              that.expressionManager.resetExpression();
             }
-          );
+            that.currentAudio = void 0;
+          });
           this.initializeAudio(audio, volume);
         } catch (e) {
           logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4151,7 +4136,13 @@ class MotionManager extends utils$1.EventEmitter {
       if (audio) {
         if (config.motionSync) {
           try {
-            SoundManager.play(audio);
+            SoundManager.play(audio, (that = this) => {
+              onFinish == null ? void 0 : onFinish();
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
+              }
+              that.currentAudio = void 0;
+            });
           } catch (e) {
             logger.warn(this.tag, "Failed to play audio", audio.url, e);
           }

package/dist/cubism2.js

@@ -79,7 +79,7 @@ var __async = (__this, __arguments, generator) => {
     preserveExpressionOnMotion: true,
     cubism4: CubismConfig
   };
-  const VERSION = "v0.5.1";
+  const VERSION = "v0.5.3";
   const logger = {
     log(tag, ...messages) {
       if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -3711,11 +3711,10 @@ var __async = (__this, __arguments, generator) => {
     /**
      * Creates an audio element and adds it to the {@link audios}.
      * @param file - URL of the sound file.
-     * @param onFinish - Callback invoked when the playback has finished.
      * @param onError - Callback invoked when error occurs.
      * @return Created audio element.
      */
-    static add(file, onFinish, onError) {
+    static add(file, onError) {
       return __async(this, null, function* () {
         try {
           const task = new Promise((resolve, reject) => {
@@ -3723,15 +3722,10 @@ var __async = (__this, __arguments, generator) => {
               url: file,
               volume: this._volume,
               preload: true,
-              complete: () => {
-                this.dispose(audio);
-                onFinish == null ? void 0 : onFinish();
-              },
               loaded: () => {
                 if (!(audio.media instanceof sound.webaudio.WebAudioMedia)) {
                   reject(new Error(`Error: ${file} is not WebAudioMedia`));
                 }
-                debugger;
                 resolve(audio);
               }
             });
@@ -3747,9 +3741,15 @@ var __async = (__this, __arguments, generator) => {
     /**
      * Plays the sound.
      * @param audio - An audio element.
+     * @param onFinish - Callback invoked when the playback has finished.
      */
-    static play(audio) {
-      audio.play();
+    static play(audio, onFinish) {
+      audio.play({
+        complete: () => {
+          onFinish == null ? void 0 : onFinish();
+          audio.destroy();
+        }
+      });
     }
     static addAnalyzer(audio, context) {
       const media = audio.media;
@@ -4018,25 +4018,14 @@ var __async = (__this, __arguments, generator) => {
         const file = sound2;
         if (file) {
           try {
-            audio = yield SoundManager.add(
-              file,
-              (that = this) => {
-                logger.warn(this.tag, "Audio finished playing");
-                onFinish == null ? void 0 : onFinish();
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
-              },
-              (e, that = this) => {
-                logger.error(this.tag, "Error during audio playback:", e);
-                onError == null ? void 0 : onError(e);
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
+            audio = yield SoundManager.add(file, (e, that = this) => {
+              logger.error(this.tag, "Error during audio playback:", e);
+              onError == null ? void 0 : onError(e);
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
               }
-            );
+              that.currentAudio = void 0;
+            });
             this.initializeAudio(audio, volume);
           } catch (e) {
             logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4047,7 +4036,13 @@ var __async = (__this, __arguments, generator) => {
           let playSuccess = true;
           try {
             if (config.motionSync) {
-              SoundManager.play(audio);
+              SoundManager.play(audio, () => {
+                onFinish == null ? void 0 : onFinish();
+                if (resetExpression && expression && this.expressionManager) {
+                  this.expressionManager.resetExpression();
+                }
+                this.currentAudio = void 0;
+              });
             }
           } catch (e) {
             logger.warn(this.tag, "Failed to play audio", audio.url, e);
@@ -4125,24 +4120,14 @@ var __async = (__this, __arguments, generator) => {
         const file = soundURL;
         if (file) {
           try {
-            audio = yield SoundManager.add(
-              file,
-              (that = this) => {
-                onFinish == null ? void 0 : onFinish();
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
-              },
-              (e, that = this) => {
-                logger.error(this.tag, "Error during audio playback:", e);
-                onError == null ? void 0 : onError(e);
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
+            audio = yield SoundManager.add(file, (e, that = this) => {
+              logger.error(this.tag, "Error during audio playback:", e);
+              onError == null ? void 0 : onError(e);
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
               }
-            );
+              that.currentAudio = void 0;
+            });
             this.initializeAudio(audio, volume);
           } catch (e) {
             logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4152,7 +4137,13 @@ var __async = (__this, __arguments, generator) => {
         if (audio) {
           if (config.motionSync) {
             try {
-              SoundManager.play(audio);
+              SoundManager.play(audio, (that = this) => {
+                onFinish == null ? void 0 : onFinish();
+                if (resetExpression && expression && that.expressionManager) {
+                  that.expressionManager.resetExpression();
+                }
+                that.currentAudio = void 0;
+              });
             } catch (e) {
               logger.warn(this.tag, "Failed to play audio", audio.url, e);
             }