From 042290f61d6d39e815a42488abed31c54129fa07 Mon Sep 17 00:00:00 2001 From: mcht67 Date: Wed, 19 Jun 2024 21:10:21 +0200 Subject: [PATCH] merges main into feat_InterpolationExp --- source/PluginParameters.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/source/PluginParameters.h b/source/PluginParameters.h index 7afa0be..48329eb 100644 --- a/source/PluginParameters.h +++ b/source/PluginParameters.h @@ -27,12 +27,9 @@ class PluginParameters { ZLFO_PHASE_ID = {"param_zlfo_phase", 1}, ZLFO_OFFSET_ID = {"param_zlfo_offset", 1}, PRESETS_ID = {"param_presets", 1}, -<<<<<<< HEAD + DOPPLER_ID = {"param_doppler", 1}, SOFA_CHOICE_ID = {"param_sofa_choices", 1}, INTERP_ID = {"param_nearest_neighbour_interp", 1}; -======= - DOPPLER_ID = {"param_doppler", 1}; ->>>>>>> main @@ -57,14 +54,10 @@ class PluginParameters { ZLFO_DEPTH_NAME = "Z LFO Depth", ZLFO_PHASE_NAME = "Z LFO Phase", ZLFO_OFFSET_NAME = "Z LFO Offset", -<<<<<<< HEAD - PRESETS_NAME = "Presets", + PRESETS_NAME = "Presets", + DOPPLER_NAME = "Doppler Effect Enabled", SOFA_CHOICE_NAME = "Sofa Choices", INTERP_NAME = "Nearest Neighbour Interpolation"; -======= - PRESETS_NAME = "Presets", - DOPPLER_NAME = "Doppler Effect Enabled"; ->>>>>>> main