|
@@ -34,7 +34,16 @@ void ConfigurationScreen::keyPressed(unsigned char x, unsigned char y)
|
|
|
sequencer.beats.expand(factor);
|
|
|
sequencer.player.setBpm(sequencer.player.getBpm() * factor);
|
|
|
} break;
|
|
|
+ case 2: { // sequence reduction erasing conflicts
|
|
|
+ unsigned int factor = x + 2;
|
|
|
+ sequencer.beats.reduceErasingConflicts(factor);
|
|
|
+ sequencer.player.setBpm(
|
|
|
+ std::max(sequencer.player.getBpm() / factor,
|
|
|
+ (Player::Bpm)1
|
|
|
+ ));
|
|
|
+ } break;
|
|
|
}
|
|
|
+ sequencer.beats.print(std::cout);
|
|
|
}
|
|
|
|
|
|
refreshAll();
|
|
@@ -65,7 +74,10 @@ void ConfigurationScreen::refresh(unsigned char x, unsigned char y)
|
|
|
}
|
|
|
} break;
|
|
|
case 1: // sequence expansion
|
|
|
- setColor(x, y, colors::sequenceExpansionButton);
|
|
|
+ setColor(x, y, colors::sequenceExpansionButton);
|
|
|
+ break;
|
|
|
+ case 2: // reduce erasing conflicts
|
|
|
+ setColor(x, y, colors::sequenceReductionErasingConflictsButton);
|
|
|
break;
|
|
|
}
|
|
|
}
|