fix: hasSoundfont mark

The soundfont is shared across all instances, so it should be a static property of `WebMscore`.
LibreScore · Dec 28, 2020 · 2b07ee9 · 2b07ee9
1 parent f63f690
commit 2b07ee9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/web-public/src/index.js b/web-public/src/index.js
@@ -14,6 +14,14 @@ import {
 
 class WebMscore {
 
+    /**
+     * A soundfont file is loaded  
+     * (Audio needs soundfonts)
+     * @private
+     * @see setSoundFont and saveAudio
+     */
+    static hasSoundfont = false;
+
     /**
      * This promise is resolved when the runtime is fully initialized
      * @returns {Promise<void>}
@@ -307,7 +315,7 @@ class WebMscore {
      * @param {Uint8Array} data 
      */
     async setSoundFont(data) {
-        if (this.hasSoundfont) {
+        if (WebMscore.hasSoundfont) {
             // remove the old soundfont file
             Module['FS_createDataFile']('/MuseScore_General.sf3')
         }
@@ -316,16 +324,15 @@ class WebMscore {
         // side effects: the soundfont is shared across all instances
         Module['FS_createDataFile']('/', 'MuseScore_General.sf3', data, true, true)
 
-        /** @private */
-        this.hasSoundfont = true
+        WebMscore.hasSoundfont = true
     }
 
     /**
      * Export score as audio file (wav/ogg/flac/mp3)
      * @param {'wav' | 'ogg' | 'flac' | 'mp3'} format 
      */
     async saveAudio(format) {
-        if (!this.hasSoundfont) {
+        if (!WebMscore.hasSoundfont) {
             throw new Error('The soundfont is not set.')
         }
 
@@ -361,7 +368,7 @@ class WebMscore {
      * @returns {Promise<number>} Pointer to the iterator function
      */
     async _synthAudio(starttime = 0) {
-        if (!this.hasSoundfont) {
+        if (!WebMscore.hasSoundfont) {
             throw new Error('The soundfont is not set.')
         }
 

diff --git a/web-public/src/worker-helper.js b/web-public/src/worker-helper.js
@@ -251,8 +251,6 @@ class WebMscoreW {
      */
     async setSoundFont(data) {
         await this.rpc('setSoundFont', [data], [data.buffer])
-        /** @private */
-        this.hasSoundfont = true
     }
 
     /**
@@ -261,9 +259,6 @@ class WebMscoreW {
      * @returns {Promise<Uint8Array>}
      */
     saveAudio(format) {
-        if (!this.hasSoundfont) {
-            throw new Error('The soundfont is not set.')
-        }
         return this.rpc('saveAudio', [format])
     }