From eaf5d404450c4e467b981db1ea79c6871667a52e Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Fri, 25 Aug 2023 11:37:02 +0200 Subject: Add global BPM behaviour --- src/drawing.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/drawing.c') diff --git a/src/drawing.c b/src/drawing.c index fbc741c..27e265b 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -418,7 +418,12 @@ draw_bpm() { txt_drawf("SYNC", x + 2, y + 2, COL_FG); } else { // Make sure its horizontally centered if only 2 digits - int bpm = patterns[pattern_selection_loc].bpm; + int bpm; + if (settings.global_bpm) { + bpm = settings.bpm; + } else { + bpm = patterns[pattern_selection_loc].bpm; + } if (bpm >= 100) { txt_drawf("%d", x + 5, y + 2, COL_FG, bpm); } else { @@ -1672,7 +1677,7 @@ draw_notif_bar() { return; } - if (settings.help == HELP_ON) { + if (settings.help == TOGGLE_ON) { if (input_handler == handle_trigger_selection || input_handler == handle_channel_selection) { txt_drawf_small("L/R:NOTE A:PARAMS B:TOGGLE", x0 + 2, y0 + 1, color); @@ -1735,7 +1740,13 @@ draw_notif_bar() { roots[current_scale_root], scale_long[current_scale]); } break; case R_COL_BPM: { - txt_drawf_small("TEMPO: %d bpm", x0 + 2, y0 + 1, color, patterns[pattern_selection_loc].bpm); + int bpm; + if (settings.global_bpm) { + bpm = settings.bpm; + } else { + bpm = patterns[pattern_selection_loc].bpm; + } + txt_drawf_small("TEMPO: %d bpm", x0 + 2, y0 + 1, color, bpm); } break; } return; -- cgit v1.2.1