From 24a1c2718b8ae535a736ab57a0beb8a0f4c00026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mo=C5=84?= Date: Fri, 1 May 2009 16:06:15 +0200 Subject: [PATCH] remove reduntant defines --- effects.c | 58 ++++++++++++++----------------------------------------- gdigi.h | 30 ++++------------------------ 2 files changed, 19 insertions(+), 69 deletions(-) diff --git a/effects.c b/effects.c index 81f1b2b..ee63216 100644 --- a/effects.c +++ b/effects.c @@ -876,42 +876,14 @@ static EffectSettings rp500_delay_tape_settings[] = { }; static EffectSettings reverb_twin_settings[] = { - {"Reverb", TWIN_REVERB, REVERB_POSITION, &values_0_to_99}, + {"Reverb", REVERB_LEVEL, REVERB_POSITION, &values_0_to_99}, }; -static EffectSettings reverb_lex_ambience_settings[] = { - {"Predelay", LEX_AMBIENCE_PREDELAY, REVERB_POSITION, &values_0_to_15}, - {"Decay", LEX_AMBIENCE_DECAY, REVERB_POSITION, &values_0_to_99}, - {"Liveliness", LEX_AMBIENCE_LIVELINESS, REVERB_POSITION, &values_0_to_99}, - {"Level", LEX_AMBIENCE_LEVEL, REVERB_POSITION, &values_0_to_99}, -}; - -static EffectSettings reverb_lex_studio_settings[] = { - {"Predelay", LEX_STUDIO_PREDELAY, REVERB_POSITION, &values_0_to_15}, - {"Decay", LEX_STUDIO_DECAY, REVERB_POSITION, &values_0_to_99}, - {"Liveliness", LEX_STUDIO_LIVELINESS, REVERB_POSITION, &values_0_to_99}, - {"Level", LEX_STUDIO_LEVEL, REVERB_POSITION, &values_0_to_99}, -}; - -static EffectSettings reverb_lex_room_settings[] = { - {"Predelay", LEX_ROOM_PREDELAY, REVERB_POSITION, &values_0_to_15}, - {"Decay", LEX_ROOM_DECAY, REVERB_POSITION, &values_0_to_99}, - {"Liveliness", LEX_ROOM_LIVELINESS, REVERB_POSITION, &values_0_to_99}, - {"Level", LEX_ROOM_LEVEL, REVERB_POSITION, &values_0_to_99}, -}; - -static EffectSettings reverb_lex_hall_settings[] = { - {"Predelay", LEX_HALL_PREDELAY, REVERB_POSITION, &values_0_to_15}, - {"Decay", LEX_HALL_DECAY, REVERB_POSITION, &values_0_to_99}, - {"Liveliness", LEX_HALL_LIVELINESS, REVERB_POSITION, &values_0_to_99}, - {"Level", LEX_HALL_LEVEL, REVERB_POSITION, &values_0_to_99}, -}; - -static EffectSettings reverb_emt240_plate_settings[] = { - {"Predelay", EMT240_PLATE_PREDELAY, REVERB_POSITION, &values_0_to_15}, - {"Decay", EMT240_PLATE_DECAY, REVERB_POSITION, &values_0_to_99}, - {"Liveliness", EMT240_PLATE_LIVELINESS, REVERB_POSITION, &values_0_to_99}, - {"Level", EMT240_PLATE_LEVEL, REVERB_POSITION, &values_0_to_99}, +static EffectSettings reverb_lex_settings[] = { + {"Predelay", REVERB_PREDELAY, REVERB_POSITION, &values_0_to_15}, + {"Decay", REVERB_DECAY, REVERB_POSITION, &values_0_to_99}, + {"Liveliness", REVERB_LIVELINESS, REVERB_POSITION, &values_0_to_99}, + {"Level", REVERB_LEVEL, REVERB_POSITION, &values_0_to_99}, }; static EffectGroup wah_group[] = { @@ -1068,11 +1040,11 @@ static EffectGroup rp500_delay_group[] = { static EffectGroup reverb_group[] = { {REVERB_TYPE_TWIN, "Twin", REVERB_TYPE, REVERB_POSITION, reverb_twin_settings, G_N_ELEMENTS(reverb_twin_settings)}, - {REVERB_TYPE_LEX_AMBIENCE, "Lexicon ambience", REVERB_TYPE, REVERB_POSITION, reverb_lex_ambience_settings, G_N_ELEMENTS(reverb_lex_ambience_settings)}, - {REVERB_TYPE_LEX_STUDIO, "Lexicon studio", REVERB_TYPE, REVERB_POSITION, reverb_lex_studio_settings, G_N_ELEMENTS(reverb_lex_studio_settings)}, - {REVERB_TYPE_LEX_ROOM, "Lexicon room", REVERB_TYPE, REVERB_POSITION, reverb_lex_room_settings, G_N_ELEMENTS(reverb_lex_room_settings)}, - {REVERB_TYPE_LEX_HALL, "Lexicon hall", REVERB_TYPE, REVERB_POSITION, reverb_lex_hall_settings, G_N_ELEMENTS(reverb_lex_hall_settings)}, - {REVERB_TYPE_EMT240_PLATE, "EMT240 Plate", REVERB_TYPE, REVERB_POSITION, reverb_emt240_plate_settings, G_N_ELEMENTS(reverb_emt240_plate_settings)}, + {REVERB_TYPE_LEX_AMBIENCE, "Lexicon ambience", REVERB_TYPE, REVERB_POSITION, reverb_lex_settings, G_N_ELEMENTS(reverb_lex_settings)}, + {REVERB_TYPE_LEX_STUDIO, "Lexicon studio", REVERB_TYPE, REVERB_POSITION, reverb_lex_settings, G_N_ELEMENTS(reverb_lex_settings)}, + {REVERB_TYPE_LEX_ROOM, "Lexicon room", REVERB_TYPE, REVERB_POSITION, reverb_lex_settings, G_N_ELEMENTS(reverb_lex_settings)}, + {REVERB_TYPE_LEX_HALL, "Lexicon hall", REVERB_TYPE, REVERB_POSITION, reverb_lex_settings, G_N_ELEMENTS(reverb_lex_settings)}, + {REVERB_TYPE_EMT240_PLATE, "EMT240 Plate", REVERB_TYPE, REVERB_POSITION, reverb_lex_settings, G_N_ELEMENTS(reverb_lex_settings)}, }; static EffectGroup rp250_amp_group[] = { @@ -1566,10 +1538,10 @@ static Modifier modifiers[] = { {"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}, - {"Reverb Level", LEX_STUDIO_LEVEL, REVERB_POSITION, &values_0_to_99}, - {"Reverb Predelay", LEX_STUDIO_PREDELAY, REVERB_POSITION, &values_0_to_15}, + {"Reverb Decay", REVERB_DECAY, REVERB_POSITION, &values_0_to_99}, + {"Reverb Liveliness", REVERB_LIVELINESS, REVERB_POSITION, &values_0_to_99}, + {"Reverb Level", REVERB_LEVEL, REVERB_POSITION, &values_0_to_99}, + {"Reverb Predelay", REVERB_PREDELAY, REVERB_POSITION, &values_0_to_15}, {"Volume Pre FX", 2626, 13, &values_0_to_99}, {"Volume Post FX", 2626, 17, &values_0_to_99}, }; diff --git a/gdigi.h b/gdigi.h index 8047b1c..ce3c0cd 100644 --- a/gdigi.h +++ b/gdigi.h @@ -530,32 +530,10 @@ enum { #define REVERB_ON_OFF 1921 #define REVERB_POSITION 16 -#define TWIN_REVERB 1925 - -#define LEX_AMBIENCE_PREDELAY 1922 -#define LEX_AMBIENCE_DECAY 1927 -#define LEX_AMBIENCE_LIVELINESS 1933 -#define LEX_AMBIENCE_LEVEL 1925 - -#define LEX_STUDIO_PREDELAY 1922 -#define LEX_STUDIO_DECAY 1927 -#define LEX_STUDIO_LIVELINESS 1933 -#define LEX_STUDIO_LEVEL 1925 - -#define LEX_ROOM_PREDELAY 1922 -#define LEX_ROOM_DECAY 1927 -#define LEX_ROOM_LIVELINESS 1933 -#define LEX_ROOM_LEVEL 1925 - -#define LEX_HALL_PREDELAY 1922 -#define LEX_HALL_DECAY 1927 -#define LEX_HALL_LIVELINESS 1933 -#define LEX_HALL_LEVEL 1925 - -#define EMT240_PLATE_PREDELAY 1922 -#define EMT240_PLATE_DECAY 1927 -#define EMT240_PLATE_LIVELINESS 1933 -#define EMT240_PLATE_LEVEL 1925 +#define REVERB_PREDELAY 1922 +#define REVERB_DECAY 1927 +#define REVERB_LIVELINESS 1933 +#define REVERB_LEVEL 1925 #define EXP_TYPE 8194 #define EXP_POSITION 19