Feature/fm filters (#665)

* Fixed Sticky Shift Conflict (#661) Fixed conflict when Sticky Shift functionality is enabled with the Shift Acceleration that was added in #636 Fixed it by calling isButtonPressed instead of isShiftButtonPressed in order to check if the Shift button is actually being pressed rather than "stickily pressed." * enable filters for testing --------- Co-authored-by: Sean Ditny <[email protected]>
SynthstromAudible · Nov 1, 2023 · c9c64d2 · c9c64d2
1 parent b3a305f
commit c9c64d2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/deluge/gui/menu_item/filter/lpf_mode.h b/src/deluge/gui/menu_item/filter/lpf_mode.h
@@ -37,8 +37,6 @@ class LPFMode final : public Selection {
 		    l10n::getView(STRING_FOR_SVF_NOTCH),
 		};
 	}
-	bool isRelevant(Sound* sound, int32_t whichThing) override {
-		return ((sound == nullptr) || sound->synthMode != ::SynthMode::FM);
-	}
+	bool isRelevant(Sound* sound, int32_t whichThing) override { return (true); }
 };
 } // namespace deluge::gui::menu_item::filter
diff --git a/src/deluge/gui/menu_item/patched_param/integer_non_fm.h b/src/deluge/gui/menu_item/patched_param/integer_non_fm.h
@@ -22,6 +22,6 @@ namespace deluge::gui::menu_item::patched_param {
 class IntegerNonFM : public Integer {
 public:
 	using Integer::Integer;
-	bool isRelevant(Sound* sound, int32_t whichThing) override { return (sound->synthMode != SynthMode::FM); }
+	bool isRelevant(Sound* sound, int32_t whichThing) override { return (true); }
 };
 } // namespace deluge::gui::menu_item::patched_param
diff --git a/src/deluge/gui/menu_item/submenu/filter.h b/src/deluge/gui/menu_item/submenu/filter.h
@@ -22,7 +22,7 @@ namespace deluge::gui::menu_item::submenu {
 class Filter final : public Submenu {
 public:
 	using Submenu::Submenu;
-	bool isRelevant(Sound* sound, int32_t whichThing) override { return (sound->synthMode != SynthMode::FM); }
+	bool isRelevant(Sound* sound, int32_t whichThing) override { return (true); }
 };
 
 } // namespace deluge::gui::menu_item::submenu
diff --git a/src/deluge/gui/ui/sound_editor.cpp b/src/deluge/gui/ui/sound_editor.cpp
@@ -650,7 +650,7 @@ ActionResult SoundEditor::horizontalEncoderAction(int32_t offset) {
 
 void SoundEditor::selectEncoderAction(int8_t offset) {
 
-	if (Buttons::isShiftButtonPressed()) {
+	if (Buttons::isButtonPressed(deluge::hid::button::SHIFT)) {
 		offset = offset * 5;
 	}
 

diff --git a/src/deluge/processing/sound/sound.cpp b/src/deluge/processing/sound/sound.cpp
@@ -1304,14 +1304,14 @@ PatchCableAcceptance Sound::maySourcePatchToParam(PatchSource s, uint8_t p, Para
 	case Param::Local::LPF_FREQ:
 	case Param::Local::LPF_RESONANCE:
 		if (synthMode == SynthMode::FM) {
-			return PatchCableAcceptance::DISALLOWED;
+			//return PatchCableAcceptance::DISALLOWED;
 		}
 		break;
 
 	case Param::Local::HPF_FREQ:
 	case Param::Local::HPF_RESONANCE:
 		if (synthMode == SynthMode::FM) {
-			return PatchCableAcceptance::DISALLOWED;
+			//return PatchCableAcceptance::DISALLOWED;
 		}
 		break;
 
@@ -2916,7 +2916,7 @@ bool Sound::anyNoteIsOn() {
 }
 
 bool Sound::hasFilters() {
-	return (getSynthMode() != SynthMode::FM);
+	return true;
 }
 
 void Sound::readParamsFromFile(ParamManagerForTimeline* paramManager, int32_t readAutomationUpToPos) {