From 81bd13379dd4d6ef84b29dd9d70302fc4c7384ce Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sun, 19 Apr 2009 02:28:32 +0300 Subject: [PATCH] Put voice oscillator parameters into dedicated group --- zynadd_dynparam_forest_map_voice.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/zynadd_dynparam_forest_map_voice.c b/zynadd_dynparam_forest_map_voice.c index 230dd86..c89bfe2 100644 --- a/zynadd_dynparam_forest_map_voice.c +++ b/zynadd_dynparam_forest_map_voice.c @@ -45,8 +45,9 @@ #define LV2DYNPARAM_PARAMETERS_COUNT 9 #define LV2DYNPARAM_GROUP_VOICEX 0 +#define LV2DYNPARAM_GROUP_OSCILLATOR 1 -#define LV2DYNPARAM_GROUPS_COUNT 1 +#define LV2DYNPARAM_GROUPS_COUNT 2 struct group_descriptor g_voice_forest_map_groups[LV2DYNPARAM_GROUPS_COUNT]; struct parameter_descriptor g_voice_forest_map_parameters[LV2DYNPARAM_PARAMETERS_COUNT]; @@ -66,14 +67,17 @@ void zynadd_init_voice_forest_map() LV2DYNPARAM_PARAMETER_INIT_BOOL(VOICEX, RESONANCE, VOICE_GLOBALS, RESONANCE, "Resonance", ALWAYS, NULL); LV2DYNPARAM_PARAMETER_INIT_BOOL(VOICEX, WHITE_NOISE, VOICE_GLOBALS, WHITE_NOISE, "White Noise", ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_ENUM(VOICEX, OSCILLATOR_BASE_FUNCTION, VOICE_OSCILLATOR, OSCILLATOR_BASE_FUNCTION, "Base function", g_oscillator_base_function_names, ZYN_OSCILLATOR_BASE_FUNCTIONS_COUNT, ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_FLOAT(VOICEX, OSCILLATOR_BASE_FUNCTION_ADJUST, VOICE_OSCILLATOR, OSCILLATOR_BASE_FUNCTION_ADJUST, "Base function adjust", 0, 1, ALWAYS, NULL); + LV2DYNPARAM_GROUP_INIT(VOICEX, OSCILLATOR, "Oscillator", NULL); + { + LV2DYNPARAM_PARAMETER_INIT_ENUM(OSCILLATOR, OSCILLATOR_BASE_FUNCTION, VOICE_OSCILLATOR, OSCILLATOR_BASE_FUNCTION, "Base function", g_oscillator_base_function_names, ZYN_OSCILLATOR_BASE_FUNCTIONS_COUNT, ALWAYS, NULL); + LV2DYNPARAM_PARAMETER_INIT_FLOAT(OSCILLATOR, OSCILLATOR_BASE_FUNCTION_ADJUST, VOICE_OSCILLATOR, OSCILLATOR_BASE_FUNCTION_ADJUST, "Base function adjust", 0, 1, ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_ENUM(VOICEX, OSCILLATOR_WAVESHAPE_TYPE, VOICE_OSCILLATOR, OSCILLATOR_WAVESHAPE_TYPE, "Waveshape type", g_oscillator_waveshape_type_names, ZYN_OSCILLATOR_WAVESHAPE_TYPES_COUNT, ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_FLOAT(VOICEX, OSCILLATOR_WAVESHAPE_DRIVE, VOICE_OSCILLATOR, OSCILLATOR_WAVESHAPE_DRIVE, "Waveshape drive", 0, 100, ALWAYS, NULL); + LV2DYNPARAM_PARAMETER_INIT_ENUM(OSCILLATOR, OSCILLATOR_WAVESHAPE_TYPE, VOICE_OSCILLATOR, OSCILLATOR_WAVESHAPE_TYPE, "Waveshape type", g_oscillator_waveshape_type_names, ZYN_OSCILLATOR_WAVESHAPE_TYPES_COUNT, ALWAYS, NULL); + LV2DYNPARAM_PARAMETER_INIT_FLOAT(OSCILLATOR, OSCILLATOR_WAVESHAPE_DRIVE, VOICE_OSCILLATOR, OSCILLATOR_WAVESHAPE_DRIVE, "Waveshape drive", 0, 100, ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_ENUM(VOICEX, OSCILLATOR_SPECTRUM_ADJUST_TYPE, VOICE_OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST_TYPE, "Spectrum adjust type", g_oscillator_spectrum_adjust_type_names, ZYN_OSCILLATOR_SPECTRUM_ADJUST_TYPES_COUNT, ALWAYS, NULL); - LV2DYNPARAM_PARAMETER_INIT_FLOAT(VOICEX, OSCILLATOR_SPECTRUM_ADJUST, VOICE_OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST, "Spectrum adjust", 0, 100, ALWAYS, NULL); + LV2DYNPARAM_PARAMETER_INIT_ENUM(OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST_TYPE, VOICE_OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST_TYPE, "Spectrum adjust type", g_oscillator_spectrum_adjust_type_names, ZYN_OSCILLATOR_SPECTRUM_ADJUST_TYPES_COUNT, ALWAYS, NULL); + LV2DYNPARAM_PARAMETER_INIT_FLOAT(OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST, VOICE_OSCILLATOR, OSCILLATOR_SPECTRUM_ADJUST, "Spectrum adjust", 0, 100, ALWAYS, NULL); + } } LV2DYNPARAM_FOREST_MAP_END; -- 2.11.4.GIT