Skip to content

add Keyframer Sequencer mode to context menu #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jweather wants to merge 2 commits into
base: v0.6
Choose a base branch
from
Open

add Keyframer Sequencer mode to context menu #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b4e9e
add Keyframer Sequencer mode to context menu
jweather Jun 28, 2018
4951564
Modulation param affects step trigger input in sequencer mode
jweather Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/Frames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,21 @@ struct Frames : Module {
frames::Keyframer keyframer;
frames::PolyLfo poly_lfo;
bool poly_lfo_mode = false;
bool sequencer_mode = false;
uint16_t lastControls[4] = {};
uint8_t sequencer_step = 0;

SchmittTrigger addTrigger;
SchmittTrigger delTrigger;
SchmittTrigger stepTrigger;

Frames();
void step() override;

json_t *toJson() override {
json_t *rootJ = json_object();
json_object_set_new(rootJ, "polyLfo", json_boolean(poly_lfo_mode));
json_object_set_new(rootJ, "seqMode", json_boolean(sequencer_mode));

json_t *keyframesJ = json_array();
for (int i = 0; i < keyframer.num_keyframes(); i++) {
Expand Down Expand Up @@ -87,6 +91,10 @@ struct Frames : Module {
if (polyLfoJ)
poly_lfo_mode = json_boolean_value(polyLfoJ);

json_t *seqModeJ = json_object_get(rootJ, "seqMode");
if (seqModeJ)
sequencer_mode = json_boolean_value(seqModeJ);

json_t *keyframesJ = json_object_get(rootJ, "keyframes");
if (keyframesJ) {
json_t *keyframeJ;
Expand Down Expand Up @@ -195,6 +203,16 @@ void Frames::step() {
keyframer.RemoveKeyframe(nearestTimestamp);
}
}
if (sequencer_mode) {
if (stepTrigger.process(rescale(inputs[FRAME_INPUT].value * params[MODULATION_PARAM].value, 0.1f, 2.f, 0.f, 1.f))) {
++sequencer_step;
}
if (sequencer_step >= keyframer.num_keyframes())
sequencer_step = 0;

timestampMod = keyframer.keyframe(sequencer_step).timestamp;
}

keyframer.Evaluate(timestampMod);
}

Expand Down Expand Up @@ -402,13 +420,29 @@ struct FramesWidget : ModuleWidget {
bool poly_lfo_mode;
void onAction(EventAction &e) override {
frames->poly_lfo_mode = poly_lfo_mode;
if (frames->poly_lfo_mode)
frames->sequencer_mode = false;
}
void step() override {
rightText = (frames->poly_lfo_mode == poly_lfo_mode) ? "✔" : "";
MenuItem::step();
}
};

struct FramesSeqModeItem : MenuItem {
Frames *frames;
bool sequencer_mode;
void onAction(EventAction &e) override {
frames->sequencer_mode = !frames->sequencer_mode;
if (frames->sequencer_mode)
frames->poly_lfo_mode = false;
}
void step() override {
rightText = frames->sequencer_mode ? "✔" : "";
MenuItem::step();
}
};

menu->addChild(construct<MenuLabel>());
menu->addChild(construct<MenuLabel>(&MenuLabel::text, "Channel Settings"));
for (int i = 0; i < 4; i++) {
Expand All @@ -420,6 +454,7 @@ struct FramesWidget : ModuleWidget {
menu->addChild(construct<MenuLabel>(&MenuLabel::text, "Mode"));
menu->addChild(construct<FramesModeItem>(&MenuItem::text, "Keyframer", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, false));
menu->addChild(construct<FramesModeItem>(&MenuItem::text, "Poly LFO", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, true));
menu->addChild(construct<FramesSeqModeItem>(&MenuItem::text, "Sequencer", &FramesSeqModeItem::frames, frames));
}
};

Expand Down