Add global mutes behaviour

2 files changed, 24 insertions, 16 deletions

diff --git a/src/drawing.c b/src/drawing.c
index 27e265b..50f3de3 100644
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -73,14 +73,18 @@ draw_channels(void) {
     };
     for (size_t i = 0; i < 4; i++) {
         bool active = false;
-        switch (i) {
-            case 0: { active = patterns[pattern_selection_loc].ch1.active; } break;
-            case 1: { active = patterns[pattern_selection_loc].ch2.active; } break;
-            case 2: { active = patterns[pattern_selection_loc].ch3.active; } break;
-            case 3: { active = patterns[pattern_selection_loc].ch4.active; } break;
-        }
-        if (patterns[pattern_selection_loc].empty) {
-            active = true;
+        if (settings.global_mute) {
+            active = !settings.mutes[i];
+        } else {
+            switch (i) {
+                case 0: { active = patterns[pattern_selection_loc].ch1.active; } break;
+                case 1: { active = patterns[pattern_selection_loc].ch2.active; } break;
+                case 2: { active = patterns[pattern_selection_loc].ch3.active; } break;
+                case 3: { active = patterns[pattern_selection_loc].ch4.active; } break;
+            }
+            if (patterns[pattern_selection_loc].empty) {
+                active = true;
+            }
         }
         u8 clr = active ? colors[i] : COL_OFF;
         size_t y = CHAN_START_Y + i * CHAN_OFFSET_Y;
diff --git a/src/sequencer.c b/src/sequencer.c
index 07f3012..58714cb 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -151,7 +151,8 @@ play_step(void) {
         }
         chain.playing = true;
     }
-    if (pat->ch1.active && !pat->empty) {
+    bool ch1_active = settings.global_mute ? !settings.mutes[0] : pat->ch1.active;
+    if (ch1_active && !pat->empty) {
         TriggerNote *trig = &pat->ch1.notes[step_counter];
         ChannelSquareParams *params = &pat->ch1.params[step_counter];
         if (trig->active && should_play(params->prob)) {
@@ -196,7 +197,8 @@ play_step(void) {
         SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET;
         SOUND_SQUARE1_CTRL = 0;
     }
-    if (pat->ch2.active && !pat->empty) {
+    bool ch2_active = settings.global_mute ? !settings.mutes[1] : pat->ch2.active;
+    if (ch2_active && !pat->empty) {
         TriggerNote *trig = &pat->ch2.notes[step_counter];
         ChannelSquareParams *params = &pat->ch2.params[step_counter];
         if (trig->active && should_play(params->prob)) {
@@ -222,7 +224,8 @@ play_step(void) {
         SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET;
         SOUND_SQUARE2_CTRL = 0;
     }
-    if (pat->ch3.active && !pat->empty) {
+    bool ch3_active = settings.global_mute ? !settings.mutes[2] : pat->ch3.active;
+    if (ch3_active && !pat->empty) {
         TriggerNote *trig = &pat->ch3.notes[step_counter];
         ChannelWaveParams *params = &pat->ch3.params[step_counter];
         if (trig->active && should_play(params->prob)) {
@@ -271,7 +274,8 @@ play_step(void) {
         SOUND_WAVE_FREQ = SOUND_FREQ_RESET;
         SOUND_WAVE_CTRL = SOUND_WAVE_MUTE;
     }
-    if (pat->ch4.active && !pat->empty) {
+    bool ch4_active = settings.global_mute ? !settings.mutes[3] : pat->ch4.active;
+    if (ch4_active && !pat->empty) {
         TriggerNote *trig = &pat->ch4.notes[step_counter];
         ChannelNoiseParams *params = &pat->ch4.params[step_counter];
         if (trig->active && should_play(params->prob)) {
@@ -384,10 +388,10 @@ handle_channel_selection(void) {
                 clear_pattern(pattern_selection_loc);
             }
             switch (channel_selection_loc) {
-                case 0: { pat->ch1.active ^= 1; } break;
-                case 1: { pat->ch2.active ^= 1; } break;
-                case 2: { pat->ch3.active ^= 1; } break;
-                case 3: { pat->ch4.active ^= 1; } break;
+                case 0: { if (settings.global_mute) { settings.mutes[0] ^= 1; } else { pat->ch1.active ^= 1; } } break;
+                case 1: { if (settings.global_mute) { settings.mutes[1] ^= 1; } else { pat->ch2.active ^= 1; } } break;
+                case 2: { if (settings.global_mute) { settings.mutes[2] ^= 1; } else { pat->ch3.active ^= 1; } } break;
+                case 3: { if (settings.global_mute) { settings.mutes[3] ^= 1; } else { pat->ch4.active ^= 1; } } break;
             }
             redraw_channels = true;
         }