fix translation

add small favicon (32x32 instead of 900x900) fix contrabass in sgm
spessasus · Jun 11, 2024 · 41bb7f7 · 41bb7f7
1 parent 2829f5d
commit 41bb7f7
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/index.html b/index.html
@@ -13,7 +13,7 @@
 
   <title>SpessaSynth SoundFont MIDI Player</title>
   <link rel="stylesheet" href='src/website/css/style.css'>
-  <link rel='icon' type='image/png' href='src/website/spessasynth_logo_rounded.png'>
+  <link rel='icon' type='image/png' href='src/website/favicon.ico'>
   <link rel='manifest' href='src/website/manifest.json'>
   <style>
     #github_page{
@@ -34,7 +34,7 @@ <h1 id="title" translate-path='locale.demoTitleMessage'>SpessaSynth: Online Demo
         <label id="file_upload" for='midi_file_input'  translate-path='locale.midiUploadButton'>Upload your MIDI files</label>
         <input type="file" accept=".mid" id="midi_file_input" multiple><br/>
 
-        <label id="sf_upload"> Upload the soundfont
+        <label id="sf_upload"> <p translate-path='locale.demoSoundfontUploadButton'>Upload the soundfont</p>
           <input type="file" accept=".sf2,.sf3" id="sf_file_input"><br/>
         </label>
 

diff --git a/soundfonts/SGM.sf3 b/soundfonts/SGM.sf3
diff --git a/src/spessasynth_lib/sequencer/sequencer.js b/src/spessasynth_lib/sequencer/sequencer.js
@@ -303,17 +303,17 @@ export class Sequencer {
     {
         /**
          * an array of 16 arrays (channels) and the notes are stored there
-         * @typedef {
-         * {
-         *      notes: {
+         * @typedef {{
          *          midiNote: number,
          *          start: number,
          *          length: number,
          *          velocity: number,
-         *      }[],
+         *      }} NoteTime
+         *
+         * @typedef {{
+         *      notes: NoteTime[],
          *      renderStartIndex: number
-         * }[]
-         * } NoteTimes
+         * }[]} NoteTimes
          */
 
         /**
@@ -331,6 +331,7 @@ export class Sequencer {
         let elapsedTime = 0;
         let oneTickToSeconds = 60 / (120 * this.midiData.timeDivision);
         let eventIndex = 0;
+        let unfinished = 0;
         while(eventIndex < events.length)
         {
             const event = events[eventIndex];
@@ -346,6 +347,7 @@ export class Sequencer {
                     const time = elapsedTime - note.start;
                     note.length = (time < MIN_NOTE_TIME && channel === DEFAULT_PERCUSSION ? MIN_NOTE_TIME : time);
                 }
+                unfinished--;
             }
             // note on
             else if(status === 0x9)
@@ -358,6 +360,7 @@ export class Sequencer {
                         const time = elapsedTime - note.start;
                         note.length = (time < MIN_NOTE_TIME && channel === DEFAULT_PERCUSSION ? MIN_NOTE_TIME : time);
                     }
+                    unfinished--;
                 }
                 else {
                     noteTimes[event.messageStatusByte & 0x0F].notes.push({
@@ -366,6 +369,7 @@ export class Sequencer {
                         length: -1,
                         velocity: event.messageData[1] / 127
                     });
+                    unfinished++;
                 }
             }
             // set tempo
@@ -379,7 +383,20 @@ export class Sequencer {
             elapsedTime += oneTickToSeconds * (events[eventIndex].ticks - event.ticks);
         }
 
-        console.info("%cFinished loading note times and ready to render the sequence!", consoleColors.info);
+        // finish the unfinished notes
+        if(unfinished > 0)
+        {
+            // for every channel, for every note that is unfinished (has -1 length)
+            noteTimes.forEach((channel, channelNumber) =>
+                channel.notes.filter(n => n.length === -1).forEach(note =>
+                {
+                    const time = elapsedTime - note.start;
+                    note.length = (time < MIN_NOTE_TIME && channelNumber === DEFAULT_PERCUSSION ? MIN_NOTE_TIME : time);
+                })
+            )
+        }
+
+        console.info(`%cFinished loading note times and ready to render the sequence!`, consoleColors.info);
         this.renderer.connectSequencer(noteTimes, this);
     }
 

diff --git a/src/website/demo_main.js b/src/website/demo_main.js
@@ -77,6 +77,7 @@ async function loadLastSoundFontFromDatabase()
                 if(!result)
                 {
                     resolve(undefined);
+                    return;
                 }
                 resolve(result.data);
             }
@@ -93,7 +94,14 @@ async function demoInit()
     {
         console.info("Failed to load from db, fetching online instead");
         loadedFromDb = false;
-        soundFontBuffer = await fetchFont(`soundfonts/${SF_NAME}`, percent => titleMessage.innerText = `Loading SF3: ${percent}%`);
+        const progressBar = document.getElementById("progress_bar");
+        titleMessage.innerText = "Loading bundled SoundFont, please wait.";
+        soundFontBuffer = await fetchFont(`soundfonts/${SF_NAME}`, percent =>
+        {
+            titleMessage.innerText = `Loading bundled SoundFont (${percent}%), please wait.`;
+            progressBar.style.width = `${(percent / 100) * titleMessage.offsetWidth}px`
+        });
+        progressBar.style.width = "0";
     }
     else
     {

diff --git a/src/website/favicon.ico b/src/website/favicon.ico
diff --git a/src/website/local_edition_index.html b/src/website/local_edition_index.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>SpessaSynth Local Edition</title>
   <link rel="stylesheet" href='website/css/style.css'>
-  <link rel='icon' href='website/spessasynth_logo_rounded.png'>
+  <link rel='icon' href='website/favicon.ico'>
 </head>
 <body>
   <div class='spessasynth_main'>

diff --git a/src/website/manifest.json b/src/website/manifest.json
@@ -4,9 +4,8 @@
   "lang": "en",
   "icons": [
     {
-      "src": "spessasynth_logo_rounded.png",
-      "type": "image/png",
-      "sizes": "930x930"
+      "src": "favicon.ico",
+      "sizes": "32x32"
     }
   ],
   "start_url": "../../index.html",

diff --git a/src/website/ui/sequencer_ui/sequencer_ui.js b/src/website/ui/sequencer_ui/sequencer_ui.js
@@ -189,8 +189,8 @@ export class SequencerUI{
                 // instantly append if lyrics and 100ms batches otherwise, to avoid that initial setup text spam (looking at you, touhou midis)
                 this.lyricsElement.text.innerText = this.text;
                 this.requiresTextUpdate = false;
+                this.lyricsElement.mainDiv.scrollTo(0, this.lyricsElement.text.scrollHeight);
             }
-            this.lyricsElement.mainDiv.scrollTo(0, this.lyricsElement.text.scrollHeight);
         }
 
         this.seq.onTimeChange = () => {
@@ -465,6 +465,7 @@ export class SequencerUI{
             if(this.requiresTextUpdate) {
                 this.lyricsElement.text.innerText = this.text;
                 this.requiresTextUpdate = false;
+                this.lyricsElement.mainDiv.scrollTo(0, this.lyricsElement.text.scrollHeight);
             }
         }, 100);
     }