From 85ce157bb8e1a92547051cd0ee26d1ba5aba43c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mo=C5=84?= Date: Fri, 17 Apr 2009 17:45:01 +0200 Subject: [PATCH] remove reduntant defines --- effects.c | 52 +++++++++++++++++----------------- gdigi.h | 85 ++----------------------------------------------------- 2 files changed, 28 insertions(+), 109 deletions(-) diff --git a/effects.c b/effects.c index 7cf6fcd..9117bb9 100644 --- a/effects.c +++ b/effects.c @@ -785,39 +785,39 @@ static EffectSettings chorusfx_octaver_settings[] = { static EffectSettings delay_analog_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Level", ANALOG_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Repeats", ANALOG_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, }; static EffectSettings delay_digital_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Level", DIGITAL_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Repeats", DIGITAL_REPEATS, DELAY_POSITION, &values_delay_repeats}, - {"Ducker thresh", DIGITAL_DUCKER_THRESH, DELAY_POSITION, &values_0_to_99}, - {"Ducker level", DIGITAL_DUCKER_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Ducker thresh", DELAY_DUCK_THRESH, DELAY_POSITION, &values_0_to_99}, + {"Ducker level", DELAY_DUCK_LEVEL, DELAY_POSITION, &values_0_to_99}, }; static EffectSettings delay_modulated_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Level", MODULATED_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Repeats", MODULATED_REPEATS, DELAY_POSITION, &values_delay_repeats}, - {"Depth", MODULATED_DEPTH, DELAY_POSITION, &values_0_to_99}, + {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Depth", DELAY_DEPTH, DELAY_POSITION, &values_0_to_99}, }; static EffectSettings delay_pong_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Level", PONG_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Repeats", PONG_REPEATS, DELAY_POSITION, &values_delay_repeats}, - {"Ducker thresh", PONG_DUCKER_THRESH, DELAY_POSITION, &values_0_to_99}, - {"Ducker level", PONG_DUCKER_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Ducker thresh", DELAY_DUCK_THRESH, DELAY_POSITION, &values_0_to_99}, + {"Ducker level", DELAY_DUCK_LEVEL, DELAY_POSITION, &values_0_to_99}, }; static EffectSettings delay_tape_settings[] = { {"Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Level", TAPE_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Repeats", TAPE_REPEATS, DELAY_POSITION, &values_delay_repeats}, - {"Wow", TAPE_WOW, DELAY_POSITION, &values_0_to_99}, - {"Flutter", TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, + {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Wow", DELAY_TAPE_WOW, DELAY_POSITION, &values_0_to_99}, + {"Flutter", DELAY_TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, }; static EffectSettings rp500_delay_digital_settings[] = { @@ -871,8 +871,8 @@ static EffectSettings rp500_delay_tape_settings[] = { {"Tap Time", DELAY_TAP_TIME_0_4990, DELAY_POSITION, &values_delay_time_0_4990}, {"Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, {"Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Tape Wow", TAPE_WOW, DELAY_POSITION, &values_0_to_99}, - {"Tape Flutter", TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, + {"Tape Wow", DELAY_TAPE_WOW, DELAY_POSITION, &values_0_to_99}, + {"Tape Flutter", DELAY_TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, }; static EffectSettings reverb_twin_settings[] = { @@ -1504,13 +1504,13 @@ static Modifier modifiers[] = { {"IPS Level", IPS_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, {"Delay Enable", DELAY_ON_OFF, DELAY_POSITION, &values_on_off}, {"Delay Time", DELAY_TIME, DELAY_POSITION, &values_delay_time}, - {"Delay Repeats", ANALOG_REPEATS, DELAY_POSITION, &values_delay_repeats}, - {"Delay Level", ANALOG_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Delay Duck Thresh", DIGITAL_DUCKER_THRESH, DELAY_POSITION, &values_0_to_99}, - {"Delay Duck Level", DIGITAL_DUCKER_LEVEL, DELAY_POSITION, &values_0_to_99}, - {"Delay Mod Depth", MODULATED_DEPTH, DELAY_POSITION, &values_0_to_99}, - {"Delay Tape Wow", TAPE_WOW, DELAY_POSITION, &values_0_to_99}, - {"Delay Tape Flut", TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, + {"Delay Repeats", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, + {"Delay Level", DELAY_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Delay Duck Thresh", DELAY_DUCK_THRESH, DELAY_POSITION, &values_0_to_99}, + {"Delay Duck Level", DELAY_DUCK_LEVEL, DELAY_POSITION, &values_0_to_99}, + {"Delay Mod Depth", DELAY_DEPTH, DELAY_POSITION, &values_0_to_99}, + {"Delay Tape Wow", DELAY_TAPE_WOW, DELAY_POSITION, &values_0_to_99}, + {"Delay Tape Flut", DELAY_TAPE_FLUTTER, DELAY_POSITION, &values_0_to_99}, {"Reverb Enable", REVERB_ON_OFF, REVERB_POSITION, &values_on_off}, {"Reverb Decay", LEX_AMBIENCE_DECAY, REVERB_POSITION, &values_0_to_99}, {"Reverb Liveliness", LEX_STUDIO_LIVELINESS, REVERB_POSITION, &values_0_to_99}, diff --git a/gdigi.h b/gdigi.h index 415af5a..8047b1c 100644 --- a/gdigi.h +++ b/gdigi.h @@ -475,68 +475,6 @@ enum { #define OCTAVER_OCTAVE2 1747 #define OCTAVER_DRY_LEVEL 1748 -/* DUAL_CHORUS_WAVE, MULTI_CHORUS_WAVE, FLANGER_WAVE, PHASER_WAVE, - VIBROPAN_WAVE, TREMOLO_WAVE, PANNER_WAVE valid values */ -#define WAVE_TRI 0x00 -#define WAVE_SINE 0x01 -#define WAVE_SQUARE 0x02 - -/* WHAMMY_AMOUNT valid values */ -#define WHAMMY_OCT_UP 0x00 -#define WHAMMY_2OCT_UP 0x01 -#define WHAMMY_2ND_DN 0x02 -#define WHAMMY_RV_2ND 0x03 -#define WHAMMY_4TH_DN 0x04 -#define WHAMMY_OCT_DN 0x05 -#define WHAMMY_2OCT_DN 0x06 -#define WHAMMY_DIV_BMB 0x07 -#define WHAMMY_M3_MA 0x08 -#define WHAMMY_2ND_MA3 0x09 -#define WHAMMY_3RD_4TH 0x0A -#define WHAMMY_4TH_5TH 0x0B -#define WHAMMY_5TH_OCT 0x0C -#define WHAMMY_HOCT_UP 0x0D -#define WHAMMY_HOCT_DN 0x0E -#define WHAMMY_OCT_UD 0x0F - -/* IPS_SHIFT_AMOUNT valid values */ -#define IPS_OCT_D 0x00 -#define IPS_7TH_DN 0x01 -#define IPS_6TH_DN 0x02 -#define IPS_5TH_DN 0x03 -#define IPS_4TH_DN 0x04 -#define IPS_3RD_DN 0x05 -#define IPS_2ND_DN 0x06 -#define IPS_2ND_UP 0x07 -#define IPS_3RD_UP 0x08 -#define IPS_4TH_UP 0x09 -#define IPS_5TH_UP 0x0A -#define IPS_6TH_UP 0x0B -#define IPS_7TH_UP 0x0C -#define IPS_OCT_U 0x0D - -/* IPS_KEY valid values */ -#define IPS_E 0x00 -#define IPS_F 0x01 -#define IPS_GB 0x02 -#define IPS_G 0x03 -#define IPS_AB 0x04 -#define IPS_A 0x05 -#define IPS_BB 0x06 -#define IPS_B 0x07 -#define IPS_C 0x08 -#define IPS_DB 0x09 -#define IPS_D 0x0A -#define IPS_EB 0x0B - -/* IPS_SCALE valid values */ -#define IPS_MAJOR 0x00 -#define IPS_MINOR 0x01 -#define IPS_DORIA 0x02 -#define IPS_MIXLYD 0x03 -#define IPS_LYDIAN 0x04 -#define IPS_HMINO 0x05 - enum { DELAY_TYPE_ANALOG = 1046, DELAY_TYPE_DIGITAL = 1045, @@ -560,27 +498,8 @@ enum { #define DELAY_TIME 1888 -#define ANALOG_LEVEL 1860 -#define ANALOG_REPEATS 1863 - -#define DIGITAL_LEVEL 1860 -#define DIGITAL_REPEATS 1863 -#define DIGITAL_DUCKER_THRESH 1889 -#define DIGITAL_DUCKER_LEVEL 1890 - -#define MODULATED_LEVEL 1860 -#define MODULATED_REPEATS 1863 -#define MODULATED_DEPTH 1873 - -#define PONG_LEVEL 1860 -#define PONG_REPEATS 1863 -#define PONG_DUCKER_THRESH 1889 -#define PONG_DUCKER_LEVEL 1890 - -#define TAPE_LEVEL 1860 -#define TAPE_REPEATS 1863 -#define TAPE_WOW 1891 -#define TAPE_FLUTTER 1892 +#define DELAY_TAPE_WOW 1891 +#define DELAY_TAPE_FLUTTER 1892 #define DELAY_LEVEL 1860 #define DELAY_REPEATS 1863