diff options
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -146,11 +146,11 @@ render_settings(void) { | |||
146 | y0 += 17; | 146 | y0 += 17; |
147 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); | 147 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); |
148 | txt_drawf("MUTE", x0 + 2, y0 + 1, COL_FG); | 148 | txt_drawf("MUTE", x0 + 2, y0 + 1, COL_FG); |
149 | txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG); | 149 | txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, toggle_settings_str[settings.global_mute]); |
150 | y0 += 17; | 150 | y0 += 17; |
151 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); | 151 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); |
152 | txt_drawf("BPM", x0 + 2, y0 + 1, COL_FG); | 152 | txt_drawf("BPM", x0 + 2, y0 + 1, COL_FG); |
153 | txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG); | 153 | txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, toggle_settings_str[settings.global_bpm]); |
154 | y0 += 17; | 154 | y0 += 17; |
155 | 155 | ||
156 | txt_drawf("GENERAL", x0, y0, COL_FG); | 156 | txt_drawf("GENERAL", x0, y0, COL_FG); |
@@ -158,7 +158,7 @@ render_settings(void) { | |||
158 | y0 += 17; | 158 | y0 += 17; |
159 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); | 159 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); |
160 | txt_drawf("AUTO-SAVE", x0 + 2, y0 + 1, COL_FG); | 160 | txt_drawf("AUTO-SAVE", x0 + 2, y0 + 1, COL_FG); |
161 | txt_drawf("OFF", x1 + 8, y0 + 1, COL_FG); | 161 | txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, toggle_settings_str[settings.auto_save]); |
162 | y0 += 17; | 162 | y0 += 17; |
163 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); | 163 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); |
164 | txt_drawf("SYNC", x0 + 2, y0 + 1, COL_FG); | 164 | txt_drawf("SYNC", x0 + 2, y0 + 1, COL_FG); |
@@ -170,7 +170,7 @@ render_settings(void) { | |||
170 | y0 += 17; | 170 | y0 += 17; |
171 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); | 171 | draw_rect(x0, y0, x1, y0 + 10, COL_FG); |
172 | txt_drawf("HELP", x0 + 2, y0 + 1, COL_FG); | 172 | txt_drawf("HELP", x0 + 2, y0 + 1, COL_FG); |
173 | txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, help_setting_str[settings.help]); | 173 | txt_drawf("%s", x1 + 8, y0 + 1, COL_FG, toggle_settings_str[settings.help]); |
174 | 174 | ||
175 | PROF(draw_settings_cursor(), draw_cursor_cycles); | 175 | PROF(draw_settings_cursor(), draw_cursor_cycles); |
176 | } | 176 | } |
@@ -224,7 +224,11 @@ update(void) { | |||
224 | last_pattern_loc = pattern_selection_loc; | 224 | last_pattern_loc = pattern_selection_loc; |
225 | last_right_col_loc = right_col_selection_loc; | 225 | last_right_col_loc = right_col_selection_loc; |
226 | if (update_bpm) { | 226 | if (update_bpm) { |
227 | set_time(patterns[current_pattern].bpm); | 227 | if (settings.global_bpm) { |
228 | set_time(settings.bpm); | ||
229 | } else { | ||
230 | set_time(patterns[current_pattern].bpm); | ||
231 | } | ||
228 | update_bpm = false; | 232 | update_bpm = false; |
229 | } | 233 | } |
230 | if (audio_sync_click) { | 234 | if (audio_sync_click) { |