apply fixes from ASS support branch

spessasus · Dec 20, 2024 · 4d4f57a · 4d4f57a
1 parent eef2b5d
commit 4d4f57a
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 52 deletions.
diff --git a/src/spessasynth_lib/synthetizer/synth_event_handler.js b/src/spessasynth_lib/synthetizer/synth_event_handler.js
@@ -161,12 +161,33 @@ export class EventHandler
             {
                 setTimeout(() =>
                 {
-                    Object.values(this.events[name]).forEach(ev => ev(eventData));
+                    Object.values(this.events[name]).forEach(ev =>
+                    {
+                        try
+                        {
+                            ev(eventData);
+                        }
+                        catch (e)
+                        {
+                            console.error(`Error while executing an event callback for ${name}:`, e);
+                        }
+                    });
                 }, this.timeDelay * 1000);
             }
             else
             {
-                Object.values(this.events[name]).forEach(ev => ev(eventData));
+                Object.values(this.events[name]).forEach(ev =>
+                    {
+                        try
+                        {
+                            ev(eventData);
+                        }
+                        catch (e)
+                        {
+                            console.error(`Error while executing an event callback for ${name}:`, e);
+                        }
+                    }
+                );
             }
         }
     }

diff --git a/src/spessasynth_lib/synthetizer/worklet_processor.min.js b/src/spessasynth_lib/synthetizer/worklet_processor.min.js
diff --git a/src/website/css/sequencer_ui.css b/src/website/css/sequencer_ui.css
@@ -78,6 +78,7 @@
     transition: all 0.2s ease;
     visibility: hidden;
     border-radius: var(--sequi-border-radius);
+    --lyrics-text-size: larger;
 }
 
 .lyrics_title_wrapper {
@@ -114,16 +115,14 @@
 
 .lyrics_text_gray {
     opacity: 0.5;
-    font-style: italic;
-    font-size: 1rem;
+    font-size: var(--lyrics-text-size);
     font-weight: bold;
 }
 
 .lyrics_text_highlight {
     font-weight: bold;
-    font-style: italic;
     color: var(--font-color);
-    font-size: 1rem;
+    font-size: var(--lyrics-text-size);
 }
 
 .lyrics details {
@@ -144,4 +143,11 @@
 .lyrics details pre,
 .lyrics details i {
     display: inline;
+}
+
+.lyrics .general_button {
+    margin-top: 1.5rem;
+    max-width: fit-content;
+    margin-left: auto;
+    margin-right: auto;
 }
diff --git a/src/website/css/top_part.css b/src/website/css/top_part.css
@@ -78,7 +78,7 @@ input[type="file"] {
     justify-content: space-around;
 }
 
-.midi_and_sf_controller label {
+.midi_and_sf_controller label, .general_button {
     padding: 6px;
     border-radius: var(--primary-border-radius);
     cursor: pointer;
@@ -89,9 +89,10 @@ input[type="file"] {
     align-items: center;
     justify-content: center;
     transition: all 0.1s ease;
+    border: none;
 }
 
-.midi_and_sf_controller label:active {
+.midi_and_sf_controller label:active, .general_button:active {
     filter: brightness(0.9);
     transform: scale(var(--active-scale));
 }

diff --git a/src/website/js/settings_ui/handlers/keyboard_handler.js b/src/website/js/settings_ui/handlers/keyboard_handler.js
@@ -221,6 +221,10 @@ export function _createKeyboardHandler(keyboard, synthui, renderer)
                 while (synthui.synth.channelProperties[channelNumber].isMuted)
                 {
                     channelNumber++;
+                    if (synthui.synth.channelProperties[channelNumber] === undefined)
+                    {
+                        return;
+                    }
                 }
                 if (channelNumber < synthui.synth.channelsAmount)
                 {

diff --git a/src/website/minified/demo_main.min.js b/src/website/minified/demo_main.min.js
diff --git a/src/website/minified/local_main.min.js b/src/website/minified/local_main.min.js
diff --git a/src/website/minified/style.min.css b/src/website/minified/style.min.css