From 29124043ba9dd9caf1989d36aeae4fc1135d6b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mo=C5=84?= Date: Tue, 14 Apr 2009 23:23:41 +0200 Subject: [PATCH] add RP500 distortion settings --- effects.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++----- gdigi.h | 38 +++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/effects.c b/effects.c index 436e3ae..339b959 100644 --- a/effects.c +++ b/effects.c @@ -105,6 +105,11 @@ static gchar *chorus_vibrato_labels[] = { "Vibrato", }; +static gchar *loose_tight_labels[] = { + "Loose", + "Tight", +}; + static gchar *pickup_type_labels[] = { "SC>HB", "HB>SC", @@ -362,6 +367,10 @@ static EffectValues values_chorus_vibrato = { 0.0, 1.0, chorus_vibrato_labels, }; +static EffectValues values_loose_tight = { + 0.0, 1.0, loose_tight_labels, +}; + static EffectValues values_pickup_type = { 0.0, 1.0, pickup_type_labels, }; @@ -407,6 +416,13 @@ static EffectSettings dist_808_settings[] = { {"Level", DIST_808_LVL, DIST_POSITION, &values_0_to_99}, }; +static EffectSettings dist_sparkdrive_settings[] = { + {"Gain", DIST_SPARKDRIVE_GAIN, DIST_POSITION, &values_0_to_99}, + {"Tone", DIST_SPARKDRIVE_TONE, DIST_POSITION, &values_0_to_99}, + {"Clean", DIST_SPARKDRIVE_CLEAN, DIST_POSITION, &values_0_to_99}, + {"Volume", DIST_SPARKDRIVE_VOLUME, DIST_POSITION, &values_0_to_99}, +}; + static EffectSettings dist_guyod_settings[] = { {"Drive", DIST_GUYOD_DRIVE, DIST_POSITION, &values_0_to_99}, {"Level", DIST_GUYOD_LVL, DIST_POSITION, &values_0_to_99}, @@ -417,6 +433,13 @@ static EffectSettings dist_dod250_settings[] = { {"Level", DIST_DOD250_LVL, DIST_POSITION, &values_0_to_99}, }; +static EffectSettings dist_redline_settings[] = { + {"Gain", DIST_REDLINE_GAIN, DIST_POSITION, &values_0_to_99}, + {"Low", DIST_REDLINE_LOW, DIST_POSITION, &values_0_to_99}, + {"High", DIST_REDLINE_HIGH, DIST_POSITION, &values_0_to_99}, + {"Level", DIST_REDLINE_LEVEL, DIST_POSITION, &values_0_to_99}, +}; + static EffectSettings dist_rodent_settings[] = { {"Dist", DIST_RODENT_DIST, DIST_POSITION, &values_0_to_99}, {"Filter", DIST_RODENT_FILTER, DIST_POSITION, &values_0_to_99}, @@ -464,6 +487,24 @@ static EffectSettings dist_gonk_settings[] = { {"Heave", DIST_GONK_HEAVE, DIST_POSITION, &values_0_to_99}, }; +static EffectSettings dist_8tavia_settings[] = { + {"Drive", DIST_8TAVIA_DRIVE, DIST_POSITION, &values_0_to_99}, + {"Volume", DIST_8TAVIA_VOLUME, DIST_POSITION, &values_0_to_99}, +}; + +static EffectSettings dist_fuzzlator_settings[] = { + {"Fuzz", DIST_FUZZLATOR_FUZZ, DIST_POSITION, &values_0_to_99}, + {"Tone", DIST_FUZZLATOR_TONE, DIST_POSITION, &values_0_to_99}, + {"LooseTight", DIST_FUZZLATOR_LOOSETIGHT, DIST_POSITION, &values_loose_tight}, + {"Volume", DIST_FUZZLATOR_VOLUME, DIST_POSITION, &values_0_to_99}, +}; + +static EffectSettings dist_classic_fuzz_settings[] = { + {"Fuzz", DIST_CLASSIC_FUZZ_FUZZ, DIST_POSITION, &values_0_to_99}, + {"Tone", DIST_CLASSIC_FUZZ_TONE, DIST_POSITION, &values_0_to_99}, + {"Volume", DIST_CLASSIC_FUZZ_VOLUME, DIST_POSITION, &values_0_to_99}, +}; + static EffectSettings dist_fuzzy_settings[] = { {"Fuzz", DIST_FUZZY_FUZZ, DIST_POSITION, &values_0_to_99}, {"Volume", DIST_FUZZY_VOLUME, DIST_POSITION, &values_0_to_99}, @@ -890,7 +931,7 @@ static EffectGroup rp500_comp_group[] = { {COMP_TYPE_DYNA, "Dyna comp", COMP_TYPE, COMP_POSITION, comp_dyna_settings, G_N_ELEMENTS(comp_dyna_settings)}, }; -static EffectGroup dist_group[] = { +static EffectGroup rp250_dist_group[] = { {DIST_TYPE_SCREAMER, "Screamer", DIST_TYPE, DIST_POSITION, dist_screamer_settings, G_N_ELEMENTS(dist_screamer_settings)}, {DIST_TYPE_808, "808", DIST_TYPE, DIST_POSITION, dist_808_settings, G_N_ELEMENTS(dist_808_settings)}, {DIST_TYPE_GUYOD, "GuyOD", DIST_TYPE, DIST_POSITION, dist_guyod_settings, G_N_ELEMENTS(dist_guyod_settings)}, @@ -903,7 +944,28 @@ static EffectGroup dist_group[] = { {DIST_TYPE_DEATH, "Death", DIST_TYPE, DIST_POSITION, dist_death_settings, G_N_ELEMENTS(dist_death_settings)}, {DIST_TYPE_GONK, "Gonk", DIST_TYPE, DIST_POSITION, dist_gonk_settings, G_N_ELEMENTS(dist_gonk_settings)}, {DIST_TYPE_FUZZY, "Fuzzy", DIST_TYPE, DIST_POSITION, dist_fuzzy_settings, G_N_ELEMENTS(dist_fuzzy_settings)}, - {DIST_TYPE_MP, "MP", DIST_TYPE, DIST_POSITION, dist_mp_settings, G_N_ELEMENTS(dist_mp_settings)}, + {DIST_TYPE_MP, "Big MP", DIST_TYPE, DIST_POSITION, dist_mp_settings, G_N_ELEMENTS(dist_mp_settings)}, +}; + +static EffectGroup rp500_dist_group[] = { + {DIST_TYPE_SCREAMER, "Screamer", DIST_TYPE, DIST_POSITION, dist_screamer_settings, G_N_ELEMENTS(dist_screamer_settings)}, + {DIST_TYPE_808, "808", DIST_TYPE, DIST_POSITION, dist_808_settings, G_N_ELEMENTS(dist_808_settings)}, + {DIST_TYPE_SPARKDRIVE, "Sparkdrive", DIST_TYPE, DIST_POSITION, dist_sparkdrive_settings, G_N_ELEMENTS(dist_sparkdrive_settings)}, + {DIST_TYPE_GUYOD, "OD Overdrive", DIST_TYPE, DIST_POSITION, dist_guyod_settings, G_N_ELEMENTS(dist_guyod_settings)}, + {DIST_TYPE_DOD250, "DOD250", DIST_TYPE, DIST_POSITION, dist_dod250_settings, G_N_ELEMENTS(dist_dod250_settings)}, + {DIST_TYPE_REDLINE, "Redline", DIST_TYPE, DIST_POSITION, dist_redline_settings, G_N_ELEMENTS(dist_redline_settings)}, + {DIST_TYPE_RODENT, "Rodent", DIST_TYPE, DIST_POSITION, dist_rodent_settings, G_N_ELEMENTS(dist_rodent_settings)}, + {DIST_TYPE_MX, "MX", DIST_TYPE, DIST_POSITION, dist_mx_settings, G_N_ELEMENTS(dist_mx_settings)}, + {DIST_TYPE_DS, "DS", DIST_TYPE, DIST_POSITION, dist_ds_settings, G_N_ELEMENTS(dist_ds_settings)}, + {DIST_TYPE_GRUNGE, "Grunge", DIST_TYPE, DIST_POSITION, dist_grunge_settings, G_N_ELEMENTS(dist_grunge_settings)}, + {DIST_TYPE_ZONE, "Zone", DIST_TYPE, DIST_POSITION, dist_zone_settings, G_N_ELEMENTS(dist_zone_settings)}, + {DIST_TYPE_DEATH, "Death", DIST_TYPE, DIST_POSITION, dist_death_settings, G_N_ELEMENTS(dist_death_settings)}, + {DIST_TYPE_GONK, "Gonk", DIST_TYPE, DIST_POSITION, dist_gonk_settings, G_N_ELEMENTS(dist_gonk_settings)}, + {DIST_TYPE_8TAVIA, "8tavia", DIST_TYPE, DIST_POSITION, dist_8tavia_settings, G_N_ELEMENTS(dist_8tavia_settings)}, + {DIST_TYPE_FUZZLATOR, "Fuzzlator", DIST_TYPE, DIST_POSITION, dist_fuzzlator_settings, G_N_ELEMENTS(dist_fuzzlator_settings)}, + {DIST_TYPE_CLASSIC_FUZZ, "Classic Fuzz", DIST_TYPE, DIST_POSITION, dist_classic_fuzz_settings, G_N_ELEMENTS(dist_classic_fuzz_settings)}, + {DIST_TYPE_FUZZY, "Fuzzy", DIST_TYPE, DIST_POSITION, dist_fuzzy_settings, G_N_ELEMENTS(dist_fuzzy_settings)}, + {DIST_TYPE_MP, "Big MP", DIST_TYPE, DIST_POSITION, dist_mp_settings, G_N_ELEMENTS(dist_mp_settings)}, }; static EffectGroup noisegate_group[] = { @@ -1216,8 +1278,12 @@ static Effect rp500_comp_effect[] = { {NULL, COMP_ON_OFF, COMP_POSITION, rp500_comp_group, G_N_ELEMENTS(rp500_comp_group)}, }; -static Effect dist_effect[] = { - {NULL, DIST_ON_OFF, DIST_POSITION, dist_group, G_N_ELEMENTS(dist_group)}, +static Effect rp250_dist_effect[] = { + {NULL, DIST_ON_OFF, DIST_POSITION, rp250_dist_group, G_N_ELEMENTS(rp250_dist_group)}, +}; + +static Effect rp500_dist_effect[] = { + {NULL, DIST_ON_OFF, DIST_POSITION, rp500_dist_group, G_N_ELEMENTS(rp500_dist_group)}, }; static Effect noisegate_effect[] = { @@ -1267,7 +1333,7 @@ static EffectList rp250_effects[] = { {"Amplifier", rp250_amp_effect, G_N_ELEMENTS(rp250_amp_effect)}, {"Equalizer", rp250_eq_effect, G_N_ELEMENTS(rp250_eq_effect)}, {"Compressor", rp250_comp_effect, G_N_ELEMENTS(rp250_comp_effect)}, - {"Distortion", dist_effect, G_N_ELEMENTS(dist_effect)}, + {"Distortion", rp250_dist_effect, G_N_ELEMENTS(rp250_dist_effect)}, {"Noisegate", noisegate_effect, G_N_ELEMENTS(noisegate_effect)}, {"Chorus/FX", rp250_chorusfx_effect, G_N_ELEMENTS(rp250_chorusfx_effect)}, {"Delay", rp250_delay_effect, G_N_ELEMENTS(rp250_delay_effect)}, @@ -1281,7 +1347,7 @@ static EffectList rp500_effects[] = { {"Amplifier", rp500_amp_effect, G_N_ELEMENTS(rp500_amp_effect)}, {"Equalizer", rp500_eq_effect, G_N_ELEMENTS(rp500_eq_effect)}, {"Compressor", rp500_comp_effect, G_N_ELEMENTS(rp500_comp_effect)}, - {"Distortion", dist_effect, G_N_ELEMENTS(dist_effect)}, + {"Distortion", rp500_dist_effect, G_N_ELEMENTS(rp500_dist_effect)}, {"Noisegate", noisegate_effect, G_N_ELEMENTS(noisegate_effect)}, {"Chorus/FX", rp500_chorusfx_effect, G_N_ELEMENTS(rp500_chorusfx_effect)}, {"Delay", rp500_delay_effect, G_N_ELEMENTS(rp500_delay_effect)}, diff --git a/gdigi.h b/gdigi.h index 2f5794d..415af5a 100644 --- a/gdigi.h +++ b/gdigi.h @@ -68,8 +68,10 @@ enum { enum { DIST_TYPE_SCREAMER = 1280, DIST_TYPE_808 = 1292, + DIST_TYPE_SPARKDRIVE = 1286, DIST_TYPE_GUYOD = 1285, DIST_TYPE_DOD250 = 1283, + DIST_TYPE_REDLINE = 1297, DIST_TYPE_RODENT = 1281, DIST_TYPE_MX = 1291, DIST_TYPE_DS = 1282, @@ -77,6 +79,9 @@ enum { DIST_TYPE_ZONE = 1289, DIST_TYPE_DEATH = 1294, DIST_TYPE_GONK = 1293, + DIST_TYPE_8TAVIA = 1290, + DIST_TYPE_FUZZLATOR = 1295, + DIST_TYPE_CLASSIC_FUZZ = 1296, DIST_TYPE_FUZZY = 1288, DIST_TYPE_MP = 1284 }; @@ -88,41 +93,74 @@ enum { #define DIST_SCREAMER_DRIVE 2434 #define DIST_SCREAMER_TONE 2435 #define DIST_SCREAMER_LVL 2436 + #define DIST_808_OVERDRIVE 2473 #define DIST_808_TONE 2474 #define DIST_808_LVL 2475 + +#define DIST_SPARKDRIVE_GAIN 2450 +#define DIST_SPARKDRIVE_TONE 2451 +#define DIST_SPARKDRIVE_CLEAN 2452 +#define DIST_SPARKDRIVE_VOLUME 2453 + #define DIST_GUYOD_DRIVE 2448 #define DIST_GUYOD_LVL 2449 + #define DIST_DOD250_GAIN 2443 #define DIST_DOD250_LVL 2444 + +#define DIST_REDLINE_GAIN 2488 +#define DIST_REDLINE_LOW 2489 +#define DIST_REDLINE_HIGH 2490 +#define DIST_REDLINE_LEVEL 2491 + #define DIST_RODENT_DIST 2437 #define DIST_RODENT_FILTER 2438 #define DIST_RODENT_LVL 2439 + #define DIST_MX_DIST 2468 #define DIST_MX_OUTPUT 2469 #define DIST_DS_GAIN 2440 #define DIST_DS_TONE 2441 #define DIST_DS_LVL 2442 + #define DIST_GRUNGE_GRUNGE 2454 #define DIST_GRUNGE_FACE 2456 #define DIST_GRUNGE_LOUD 2457 #define DIST_GRUNGE_BUTT 2455 + #define DIST_ZONE_GAIN 2460 #define DIST_ZONE_LOW 2463 #define DIST_ZONE_MID_LVL 2462 #define DIST_ZONE_MID_FREQ 2461 #define DIST_ZONE_HIGH 2464 #define DIST_ZONE_LEVEL 2465 + #define DIST_DEATH_LOW 2477 #define DIST_DEATH_MID 2476 #define DIST_DEATH_HIGH 2479 #define DIST_DEATH_LVL 2478 + #define DIST_GONK_GONK 2480 #define DIST_GONK_SMEAR 2471 #define DIST_GONK_SUCK 2470 #define DIST_GONK_HEAVE 2472 + +#define DIST_8TAVIA_DRIVE 2466 +#define DIST_8TAVIA_VOLUME 2467 + +#define DIST_FUZZLATOR_FUZZ 2481 +#define DIST_FUZZLATOR_TONE 2482 +#define DIST_FUZZLATOR_LOOSETIGHT 2483 +#define DIST_FUZZLATOR_VOLUME 2484 + +#define DIST_CLASSIC_FUZZ_FUZZ 2485 +#define DIST_CLASSIC_FUZZ_TONE 2486 +#define DIST_CLASSIC_FUZZ_VOLUME 2487 + #define DIST_FUZZY_FUZZ 2458 #define DIST_FUZZY_VOLUME 2459 + #define DIST_MP_SUSTAIN 2445 #define DIST_MP_TONE 2446 #define DIST_MP_VOLUME 2447