Browse Source

Cleanup

master
cancel 6 years ago
parent
commit
18906ad6dd
  1. 14
      tui_main.c

14
tui_main.c

@ -501,9 +501,6 @@ int main(int argc, char** argv) {
return 1; return 1;
} }
// Set up timer lib
stm_setup();
Field field; Field field;
if (input_file) { if (input_file) {
field_init(&field); field_init(&field);
@ -537,6 +534,9 @@ int main(int argc, char** argv) {
input_file = "unnamed"; input_file = "unnamed";
field_init_fill(&field, 25, 57, '.'); field_init_fill(&field, 25, 57, '.');
} }
// Set up timer lib
stm_setup();
Markmap_reusable markmap_r; Markmap_reusable markmap_r;
markmap_reusable_init(&markmap_r); markmap_reusable_init(&markmap_r);
markmap_reusable_ensure_size(&markmap_r, field.height, field.width); markmap_reusable_ensure_size(&markmap_r, field.height, field.width);
@ -629,8 +629,8 @@ int main(int argc, char** argv) {
if (needs_remarking) { if (needs_remarking) {
field_resize_raw_if_necessary(&scratch_field, field.height, field.width); field_resize_raw_if_necessary(&scratch_field, field.height, field.width);
field_copy(&field, &scratch_field); field_copy(&field, &scratch_field);
orca_run(scratch_field.buffer, markmap_r.buffer, field.height, field.width, orca_run(scratch_field.buffer, markmap_r.buffer, field.height,
tick_num, &bank, &scratch_oevent_list, piano_bits); field.width, tick_num, &bank, &scratch_oevent_list, piano_bits);
needs_remarking = false; needs_remarking = false;
} }
int content_y = 0; int content_y = 0;
@ -766,14 +766,14 @@ int main(int argc, char** argv) {
input_mode = Tui_input_mode_piano; input_mode = Tui_input_mode_piano;
} }
break; break;
case AND_CTRL('f'): case AND_CTRL('f'): {
undo_history_push(&undo_hist, &field, tick_num); undo_history_push(&undo_hist, &field, tick_num);
orca_run(field.buffer, markmap_r.buffer, field.height, field.width, orca_run(field.buffer, markmap_r.buffer, field.height, field.width,
tick_num, &bank, &oevent_list, piano_bits); tick_num, &bank, &oevent_list, piano_bits);
++tick_num; ++tick_num;
piano_bits = ORCA_PIANO_BITS_NONE; piano_bits = ORCA_PIANO_BITS_NONE;
needs_remarking = true; needs_remarking = true;
break; } break;
case AND_CTRL('e'): case AND_CTRL('e'):
draw_event_list = !draw_event_list; draw_event_list = !draw_event_list;
break; break;

Loading…
Cancel
Save