Browse Source

Use new event framework

tags/v0.5.0
Andrew Belt 7 years ago
parent
commit
9d3b07996b
4 changed files with 8 additions and 8 deletions
  1. +2
    -2
      src/Braids.cpp
  2. +1
    -1
      src/Branches.cpp
  3. +1
    -1
      src/Elements.cpp
  4. +4
    -4
      src/Frames.cpp

+ 2
- 2
src/Braids.cpp View File

@@ -314,7 +314,7 @@ struct BraidsSettingItem : MenuItem {
uint8_t *setting = NULL; uint8_t *setting = NULL;
uint8_t offValue = 0; uint8_t offValue = 0;
uint8_t onValue = 1; uint8_t onValue = 1;
void onAction() override {
void onAction(EventAction &e) override {
// Toggle setting // Toggle setting
*setting = (*setting == onValue) ? offValue : onValue; *setting = (*setting == onValue) ? offValue : onValue;
} }
@@ -325,7 +325,7 @@ struct BraidsSettingItem : MenuItem {


struct BraidsLowCpuItem : MenuItem { struct BraidsLowCpuItem : MenuItem {
Braids *braids; Braids *braids;
void onAction() override {
void onAction(EventAction &e) override {
braids->lowCpu = !braids->lowCpu; braids->lowCpu = !braids->lowCpu;
} }
void step() override { void step() override {


+ 1
- 1
src/Branches.cpp View File

@@ -121,7 +121,7 @@ BranchesWidget::BranchesWidget() {
struct BranchesModeItem : MenuItem { struct BranchesModeItem : MenuItem {
Branches *branches; Branches *branches;
int channel; int channel;
void onAction() override {
void onAction(EventAction &e) override {
branches->mode[channel] ^= 1; branches->mode[channel] ^= 1;
} }
void step() override { void step() override {


+ 1
- 1
src/Elements.cpp View File

@@ -297,7 +297,7 @@ ElementsWidget::ElementsWidget() {
struct ElementsModalItem : MenuItem { struct ElementsModalItem : MenuItem {
Elements *elements; Elements *elements;
int model; int model;
void onAction() override {
void onAction(EventAction &e) override {
elements->setModel(model); elements->setModel(model);
} }
void step() override { void step() override {


+ 4
- 4
src/Frames.cpp View File

@@ -319,7 +319,7 @@ struct FramesCurveItem : MenuItem {
Frames *frames; Frames *frames;
uint8_t channel; uint8_t channel;
frames::EasingCurve curve; frames::EasingCurve curve;
void onAction() override {
void onAction(EventAction &e) override {
frames->keyframer.mutable_settings(channel)->easing_curve = curve; frames->keyframer.mutable_settings(channel)->easing_curve = curve;
} }
void step() override { void step() override {
@@ -331,7 +331,7 @@ struct FramesResponseItem : MenuItem {
Frames *frames; Frames *frames;
uint8_t channel; uint8_t channel;
uint8_t response; uint8_t response;
void onAction() override {
void onAction(EventAction &e) override {
frames->keyframer.mutable_settings(channel)->response = response; frames->keyframer.mutable_settings(channel)->response = response;
} }
void step() override { void step() override {
@@ -364,7 +364,7 @@ struct FramesChannelSettingsItem : MenuItem {


struct FramesClearItem : MenuItem { struct FramesClearItem : MenuItem {
Frames *frames; Frames *frames;
void onAction() override {
void onAction(EventAction &e) override {
frames->keyframer.Clear(); frames->keyframer.Clear();
} }
}; };
@@ -372,7 +372,7 @@ struct FramesClearItem : MenuItem {
struct FramesModeItem : MenuItem { struct FramesModeItem : MenuItem {
Frames *frames; Frames *frames;
bool poly_lfo_mode; bool poly_lfo_mode;
void onAction() override {
void onAction(EventAction &e) override {
frames->poly_lfo_mode = poly_lfo_mode; frames->poly_lfo_mode = poly_lfo_mode;
} }
void step() override { void step() override {


Loading…
Cancel
Save