1 files changed, 36 insertions, 29 deletions

diff --git a/src/sequencer.c b/src/sequencer.c
index 0558323..3635657 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -115,6 +115,29 @@ should_play(u8 prob) {
 }
 
 void
+select_bank(int i) {
+    chain.current = 15;
+    chain.current = find_next_pattern();
+    current_pattern = 0;
+    next_pattern = 0;
+    next_bank = i;
+    clipboard.type = CLIP_EMPTY;
+    save_bank(current_bank);
+    metadata.current_pattern = current_pattern;
+    metadata.current_bank = i;
+    save_metadata();
+    if (current_bank != i) {
+        load_bank(i);
+    }
+    current_bank = i;
+    redraw_pattern_buttons = true;
+    redraw_trigs = true;
+    redraw_channels = true;
+    redraw_bank_buttons = true;
+    redraw_bpm = true;
+}
+
+void
 play_step(void) {
     static s8 pan[4] = {0};
     Pattern *pat = &patterns[current_pattern];
@@ -122,6 +145,9 @@ play_step(void) {
         current_pattern = next_pattern;
         redraw_pattern_buttons = true;
         update_bpm = true;
+    } else if (current_bank != next_bank && step_counter == 15) {
+        select_bank(next_bank);
+        update_bpm = true;
     } else if (chain.len != 0 && step_counter == 15) {
         redraw_pattern_buttons = true;
         update_bpm = true;
@@ -528,6 +554,9 @@ toggle_playing(void) {
             current_pattern = next_pattern;
             redraw_pattern_buttons = true;
         }
+        if (current_bank != next_bank) {
+            select_bank(next_bank);
+        }
         set_time(patterns[current_pattern].bpm);
         play_step();
     } else {
@@ -574,29 +603,6 @@ pause_playing(void) {
 }
 
 void
-select_bank(int i) {
-    // TODO: queue bank if we are currently playing?
-    chain.current = 15;
-    chain.current = find_next_pattern();
-    current_pattern = 0;
-    next_pattern = 0;
-    clipboard.type = CLIP_EMPTY;
-    save_bank(current_bank);
-    metadata.current_pattern = current_pattern;
-    metadata.current_bank = i;
-    save_metadata();
-    if (current_bank != i) {
-        load_bank(i);
-    }
-    current_bank = i;
-    redraw_pattern_buttons = true;
-    redraw_trigs = true;
-    redraw_channels = true;
-    redraw_bank_buttons = true;
-    redraw_bpm = true;
-}
-
-void
 handle_right_col_selection(void) {
     if (key_tap(KEY_LEFT)) {
         switch (right_col_selection_loc) {
@@ -721,12 +727,12 @@ handle_right_col_selection(void) {
             // case R_COL_SCALE: { stop_playing(); } break; // TODO: Should scale be toggleable?
             case R_COL_STOP: { stop_playing(); } break;
             case R_COL_PLAY: { pause_playing(); } break;
-            case R_COL_BANK_A: { select_bank(0); } break;
-            case R_COL_BANK_B: { select_bank(1); } break;
-            case R_COL_BANK_C: { select_bank(2); } break;
-            case R_COL_BANK_D: { select_bank(3); } break;
-            case R_COL_BANK_E: { select_bank(4); } break;
-            case R_COL_BANK_F: { select_bank(5); } break;
+            case R_COL_BANK_A: { if (play_status) { next_bank = 0; } else { select_bank(0); } redraw_bank_buttons = true; } break;
+            case R_COL_BANK_B: { if (play_status) { next_bank = 1; } else { select_bank(1); } redraw_bank_buttons = true; } break;
+            case R_COL_BANK_C: { if (play_status) { next_bank = 2; } else { select_bank(2); } redraw_bank_buttons = true; } break;
+            case R_COL_BANK_D: { if (play_status) { next_bank = 3; } else { select_bank(3); } redraw_bank_buttons = true; } break;
+            case R_COL_BANK_E: { if (play_status) { next_bank = 4; } else { select_bank(4); } redraw_bank_buttons = true; } break;
+            case R_COL_BANK_F: { if (play_status) { next_bank = 5; } else { select_bank(5); } redraw_bank_buttons = true; } break;
         }
     }
 }
@@ -1439,6 +1445,7 @@ sequencer_init(void) {
         save_bank(5);
     } else {
         current_bank = metadata.current_bank;
+        next_bank = metadata.current_bank;
         current_pattern = metadata.current_pattern;
         next_pattern = metadata.current_pattern;
         pattern_selection_loc = current_pattern;