From 9d3b07996b00af262c8143fc86a7a86436177ac0 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 1 Nov 2017 08:40:48 -0400 Subject: [PATCH] Use new event framework --- src/Braids.cpp | 4 ++-- src/Branches.cpp | 2 +- src/Elements.cpp | 2 +- src/Frames.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Braids.cpp b/src/Braids.cpp index 9f82fa0..d73bcc6 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -314,7 +314,7 @@ struct BraidsSettingItem : MenuItem { uint8_t *setting = NULL; uint8_t offValue = 0; uint8_t onValue = 1; - void onAction() override { + void onAction(EventAction &e) override { // Toggle setting *setting = (*setting == onValue) ? offValue : onValue; } @@ -325,7 +325,7 @@ struct BraidsSettingItem : MenuItem { struct BraidsLowCpuItem : MenuItem { Braids *braids; - void onAction() override { + void onAction(EventAction &e) override { braids->lowCpu = !braids->lowCpu; } void step() override { diff --git a/src/Branches.cpp b/src/Branches.cpp index 368a2db..de79070 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -121,7 +121,7 @@ BranchesWidget::BranchesWidget() { struct BranchesModeItem : MenuItem { Branches *branches; int channel; - void onAction() override { + void onAction(EventAction &e) override { branches->mode[channel] ^= 1; } void step() override { diff --git a/src/Elements.cpp b/src/Elements.cpp index d9c88f4..3c083eb 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -297,7 +297,7 @@ ElementsWidget::ElementsWidget() { struct ElementsModalItem : MenuItem { Elements *elements; int model; - void onAction() override { + void onAction(EventAction &e) override { elements->setModel(model); } void step() override { diff --git a/src/Frames.cpp b/src/Frames.cpp index 24c5ca6..68e7ecd 100644 --- a/src/Frames.cpp +++ b/src/Frames.cpp @@ -319,7 +319,7 @@ struct FramesCurveItem : MenuItem { Frames *frames; uint8_t channel; frames::EasingCurve curve; - void onAction() override { + void onAction(EventAction &e) override { frames->keyframer.mutable_settings(channel)->easing_curve = curve; } void step() override { @@ -331,7 +331,7 @@ struct FramesResponseItem : MenuItem { Frames *frames; uint8_t channel; uint8_t response; - void onAction() override { + void onAction(EventAction &e) override { frames->keyframer.mutable_settings(channel)->response = response; } void step() override { @@ -364,7 +364,7 @@ struct FramesChannelSettingsItem : MenuItem { struct FramesClearItem : MenuItem { Frames *frames; - void onAction() override { + void onAction(EventAction &e) override { frames->keyframer.Clear(); } }; @@ -372,7 +372,7 @@ struct FramesClearItem : MenuItem { struct FramesModeItem : MenuItem { Frames *frames; bool poly_lfo_mode; - void onAction() override { + void onAction(EventAction &e) override { frames->poly_lfo_mode = poly_lfo_mode; } void step() override {