From 5f21c62a2f9894126d880d30e832f16a55ea7021 Mon Sep 17 00:00:00 2001 From: Rafael Moreno Date: Tue, 28 Jul 2009 11:38:24 +0200 Subject: [PATCH] fix RP355 support --- effects.c | 17 +++++++++++++++-- gdigi.h | 7 +++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/effects.c b/effects.c index 24edd05..f73ad85 100644 --- a/effects.c +++ b/effects.c @@ -1140,6 +1140,12 @@ static EffectSettings delay_analog_settings[] = { {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, }; +static EffectSettings delay_dm_settings[] = { + {"Repeat Rate", DELAY_REPEAT_RATE_DM, DELAY_POSITION, &values_0_to_99}, + {"Echo", DELAY_ECHO, DELAY_POSITION, &values_0_to_99}, + {"Intensity", DELAY_INTENSITY, DELAY_POSITION, &values_0_to_99}, +}; + static EffectSettings delay_digital_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, @@ -1171,6 +1177,12 @@ static EffectSettings delay_tape_settings[] = { {"Flutter", DELAY_TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, }; +static EffectSettings delay_echoplex_settings[] = { + {"Time", DELAY_ECHOPLEX_TIME, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS_0_99, DELAY_POSITION, &values_0_to_99}, + {"Volume", DELAY_VOLUME, DELAY_POSITION, &values_0_to_99}, +}; + static EffectSettings rp500_delay_digital_settings[] = { {"Tap Time", DELAY_TAP_TIME, DELAY_POSITION, &values_delay_time_0_5000}, {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, @@ -1464,6 +1476,7 @@ static EffectGroup rp355_chorusfx_group[] = { {CHORUS_TYPE_FLANGER, "Flanger", chorusfx_flanger_settings, G_N_ELEMENTS(chorusfx_flanger_settings)}, {CHORUS_TYPE_TRIGGERED_FLANGER, "Triggered Flanger", chorusfx_trig_flanger_settings, G_N_ELEMENTS(chorusfx_trig_flanger_settings)}, {CHORUS_TYPE_MXR_FLANGER, "MXR FLANGER", chorusfx_mxr_flanger_settings, G_N_ELEMENTS(chorusfx_mxr_flanger_settings)}, + {CHORUS_TYPE_EH_FLANGER, "EH Flanger", chorusfx_eh_flanger_settings, G_N_ELEMENTS(chorusfx_eh_flanger_settings)}, {CHORUS_TYPE_PHASER, "Phaser", chorusfx_phaser_settings, G_N_ELEMENTS(chorusfx_phaser_settings)}, {CHORUS_TYPE_TRIGGERED_PHASER, "Triggered Phaser", chorusfx_trig_phaser_settings, G_N_ELEMENTS(chorusfx_trig_phaser_settings)}, {CHORUS_TYPE_MX_PHASER, "MX Phaser", chorusfx_mx_phaser_settings, G_N_ELEMENTS(chorusfx_mx_phaser_settings)}, @@ -1545,12 +1558,12 @@ static EffectGroup rp250_delay_group[] = { static EffectGroup rp355_delay_group[] = { {DELAY_TYPE_ANALOG, "Analog", delay_analog_settings, G_N_ELEMENTS(delay_analog_settings)}, - {DELAY_RP500_TYPE_DM, "DM Delay", rp500_delay_dm_settings, G_N_ELEMENTS(rp500_delay_dm_settings)}, + {DELAY_TYPE_DM, "DM Delay", delay_dm_settings, G_N_ELEMENTS(delay_dm_settings)}, {DELAY_TYPE_DIGITAL, "Digital", delay_digital_settings, G_N_ELEMENTS(delay_digital_settings)}, {DELAY_TYPE_MODULATED, "Modulated", delay_modulated_settings, G_N_ELEMENTS(delay_modulated_settings)}, {DELAY_TYPE_PONG, "Pong", delay_pong_settings, G_N_ELEMENTS(delay_pong_settings)}, {DELAY_TYPE_TAPE, "Tape", delay_tape_settings, G_N_ELEMENTS(delay_tape_settings)}, - {DELAY_RP500_TYPE_ECHOPLEX, "Echo Plex", rp500_delay_echoplex_settings, G_N_ELEMENTS(rp500_delay_echoplex_settings)}, + {DELAY_TYPE_ECHOPLEX, "Echo Plex", delay_echoplex_settings, G_N_ELEMENTS(delay_echoplex_settings)}, }; static EffectGroup rp500_delay_group[] = { diff --git a/gdigi.h b/gdigi.h index c144a17..2c0e458 100644 --- a/gdigi.h +++ b/gdigi.h @@ -619,6 +619,8 @@ enum { DELAY_TYPE_MODULATED = 1047, DELAY_TYPE_PONG = 1048, DELAY_TYPE_TAPE = 1049, + DELAY_TYPE_ECHOPLEX = 1050, + DELAY_TYPE_DM = 1051, DELAY_RP500_TYPE_DIGITAL = 1052, DELAY_RP500_TYPE_ANALOG = 1053, @@ -651,8 +653,10 @@ enum { #define DELAY_DUCK_THRESH 1889 #define DELAY_DUCK_LEVEL 1890 #define DELAY_REPEAT_RATE 1898 +#define DELAY_REPEAT_RATE_DM 1894 #define DELAY_ECHO 1895 #define DELAY_INTENSITY 1896 +#define DELAY_ECHOPLEX_TIME 1897 #define DELAY_TIME_0_760 1899 #define DELAY_VOLUME 1893 #define DELAY_REPEATS_0_99 1874 @@ -704,6 +708,9 @@ enum { #define EXP_MIN 8195 #define EXP_MAX 8196 +#define LFO_TYPE 8258 +#define LFO1_POSITION 22 +#define LFO2_POSITION 23 #define LIBRARY_TONE 8704 #define LIBRARY_EFFECTS 8705