From 44dbbe7b72fe112d93ec8b1b51f681e44fd6de02 Mon Sep 17 00:00:00 2001 From: Tim LaBerge Date: Sun, 16 Dec 2012 11:12:10 -0800 Subject: [PATCH] Add remaining rp355 effects to modifiers array. 1) A few rp355 effects were missing from the modifiers array. 2) The EH_PHASER effects were missing from the xml_settings array. 3) Added a disambiguating string to the "Unable to map" warning in gdigi.c. --- effects.c | 29 ++++++++++++++++++++++++++++- gdigi.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/effects.c b/effects.c index c93a0da..a491c5e 100644 --- a/effects.c +++ b/effects.c @@ -3059,10 +3059,10 @@ static EffectList rp355_effects[] = { {"Chorus/FX", rp355_chorusfx_effect, G_N_ELEMENTS(rp355_chorusfx_effect)}, {"Delay", rp355_delay_effect, G_N_ELEMENTS(rp355_delay_effect)}, {"Reverb", reverb_effect, G_N_ELEMENTS(reverb_effect)}, - {"Global Settings", global_effect, G_N_ELEMENTS(global_effect)}, {"Pedal1 Assign", rp355_pedal1_assign_effect, G_N_ELEMENTS(rp355_pedal1_assign_effect)}, {"LFO1", rp355_lfo1_effect, G_N_ELEMENTS(rp355_lfo1_effect)}, {"LFO2", rp355_lfo2_effect, G_N_ELEMENTS(rp355_lfo2_effect)}, + {"Global Settings", global_effect, G_N_ELEMENTS(global_effect)}, }; static EffectList rp500_effects[] = { @@ -3375,10 +3375,14 @@ static Modifier modifiers[] = { {"Trig Phaser Sens", TRIG_PHASER_SENS, CHORUSFX_POSITION, &values_0_to_99}, {"Trig Phaser LFO", TRIG_PHASER_LFO_START, CHORUSFX_POSITION, &values_0_to_99}, {"Trig Phaser Level", TRIG_PHASER_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, + {"EH Phaser Rate", EH_PHASER_RATE, CHORUSFX_POSITION, &values_0_to_99}, + {"EH Phaser Color", EH_PHASER_COLOR, CHORUSFX_POSITION, &values_on_off}, {"Chorus Speed", CHORUS_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"Chorus Depth", CHORUS_DEPTH, CHORUSFX_POSITION, &values_0_to_99}, {"Chorus Level", CHORUS_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, {"Chorus Waveform", CHORUS_WAVE, CHORUSFX_POSITION, &values_waveform}, + {"Chorus Width", CHORUS_WIDTH, CHORUSFX_POSITION, &values_0_to_99}, + {"Chorus Intensity", CHORUS_INTENSITY, CHORUSFX_POSITION, &values_0_to_99}, {"Flanger Speed", FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"Flanger Depth", FLANGER_DEPTH, CHORUSFX_POSITION, &values_0_to_99}, {"Flanger Regen", FLANGER_REGEN, CHORUSFX_POSITION, &values_0_to_99}, @@ -3386,6 +3390,13 @@ static Modifier modifiers[] = { {"Flanger Level", FLANGER_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, {"Flanger Width", MXR_FLANGER_WIDTH, CHORUSFX_POSITION, &values_0_to_99}, {"Flanger Manual", MXR_FLANGER_MANUAL, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Level", TRIG_FLANGER_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Sens", TRIG_FLANGER_SENS, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger LFO Start", TRIG_FLANGER_LFO_START, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Speed", TRIG_FLANGER_SPEED, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Range", EH_FLANGER_RANGE, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Rate", EH_FLANGER_RATE, CHORUSFX_POSITION, &values_0_to_99}, + {"Flanger Color", EH_FLANGER_COLOR, CHORUSFX_POSITION, &values_0_to_99}, {"Vibrato Speed", VIBRATO_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"Vibrato Depth", VIBRATO_DEPTH, CHORUSFX_POSITION, &values_0_to_99}, {"Rotary Speed", ROTARY_SPEED, CHORUSFX_POSITION, &values_0_to_99}, @@ -3396,6 +3407,10 @@ static Modifier modifiers[] = { {"VibroPan Depth", VIBROPAN_DEPTH, CHORUSFX_POSITION, &values_0_to_99}, {"VibroPan VibratoPan", VIBROPAN_VIBRA, CHORUSFX_POSITION, &values_0_to_99}, {"VibroPan Waveform", VIBROPAN_WAVE, CHORUSFX_POSITION, &values_waveform}, + {"Unovibe Speed", UNOVIBE_PEDAL_SPEED, CHORUSFX_POSITION, &values_0_to_99}, + {"Unovibe Intensity", UNOVIBE_INTENSITY, CHORUSFX_POSITION, &values_0_to_99}, + {"Unovibe Volume", UNOVIBE_VOLUME, CHORUSFX_POSITION, &values_0_to_99}, + {"Unovibe Chorus/Vibrato", UNOVIBE_CHORUS_VIBRATO, CHORUSFX_POSITION, &values_chorus_vibrato}, {"Tremolo Speed", TREMOLO_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"Tremolo Depth", TREMOLO_DEPTH, CHORUSFX_POSITION, &values_0_to_99}, {"Tremolo Waveform", TREMOLO_WAVE, CHORUSFX_POSITION, &values_waveform}, @@ -3404,6 +3419,7 @@ static Modifier modifiers[] = { {"Panner Waveform", PANNER_WAVE, CHORUSFX_POSITION, &values_waveform}, {"Envelope Sens.", ENVELOPE_SENSITIVITY, CHORUSFX_POSITION, &values_0_to_99}, {"Envelope Range", ENVELOPE_RANGE, CHORUSFX_POSITION, &values_0_to_99}, + {"Envelope Blend", ENVELOPE_BLEND, CHORUSFX_POSITION, &values_0_to_99}, {"AutoYa Speed", AUTOYA_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"AutoYa Intensity", AUTOYA_INTENSITY, CHORUSFX_POSITION, &values_0_to_99}, {"AutoYa Range", AUTOYA_RANGE, CHORUSFX_POSITION, &values_0_to_49}, @@ -3412,6 +3428,11 @@ static Modifier modifiers[] = { {"YaYa Range", YAYA_RANGE, CHORUSFX_POSITION, &values_0_to_49}, {"Step Filter Speed", STEP_FILTER_SPEED, CHORUSFX_POSITION, &values_0_to_99}, {"Step Filter Intensity", STEP_FILTER_INTENSITY, CHORUSFX_POSITION, &values_0_to_99}, + {"Synth Talk Attack", SYNTH_TALK_ATTACK, CHORUSFX_POSITION, &values_0_to_99}, + {"Synth Talk Release", SYNTH_TALK_RELEASE, CHORUSFX_POSITION, &values_0_to_99}, + {"Synth Talk Sens", SYNTH_TALK_SENS, CHORUSFX_POSITION, &values_0_to_99}, + {"Synth Talk Vox", SYNTH_TALK_VOX, CHORUSFX_POSITION, &values_0_to_99}, + {"Synth Talk Balance", SYNTH_TALK_BALANCE, CHORUSFX_POSITION, &values_balance}, {"Whammy Amount", WHAMMY_AMOUNT, CHORUSFX_POSITION, &values_whammy_amount}, {"Whammy Pedal", WHAMMY_PEDAL, CHORUSFX_POSITION, &values_0_to_99}, {"Whammy Mix", WHAMMY_MIX, CHORUSFX_POSITION, &values_0_to_99}, @@ -3423,6 +3444,10 @@ static Modifier modifiers[] = { {"IPS Key", IPS_KEY, CHORUSFX_POSITION, &values_ips_key}, {"IPS Scale", IPS_SCALE, CHORUSFX_POSITION, &values_ips_scale}, {"IPS Level", IPS_LEVEL, CHORUSFX_POSITION, &values_0_to_99}, + {"Octaver Octave 1", OCTAVER_OCTAVE1, CHORUSFX_POSITION, &values_0_to_99}, + {"Octaver Octave 2", OCTAVER_OCTAVE2, CHORUSFX_POSITION, &values_0_to_99}, + {"Octaver Dry Level", OCTAVER_DRY_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", DELAY_REPEATS, DELAY_POSITION, &values_delay_repeats}, @@ -3985,6 +4010,8 @@ XmlSettings xml_settings[] = { {PHASER_REGEN, CHORUSFX_POSITION, "Phaser Regen", &values_0_to_99,}, {PHASER_WAVE, CHORUSFX_POSITION, "Phaser Waveform", &values_waveform, xml_waveform_labels, G_N_ELEMENTS(xml_waveform_labels)}, {PHASER_LEVEL, CHORUSFX_POSITION, "Phaser Level", &values_0_to_99,}, + {EH_PHASER_RATE, CHORUSFX_POSITION, "Phaser Rate", &values_0_to_99,}, + {EH_PHASER_COLOR, CHORUSFX_POSITION, "Phaser xml Color", &values_on_off, xml_on_off_labels,G_N_ELEMENTS(xml_on_off_labels)}, {MX_PHASER_INTENSITY, CHORUSFX_POSITION, "Intensity", &values_1_to_4,}, {CHORUS_SPEED, CHORUSFX_POSITION, "Chorus Speed", &values_0_to_99,}, {CHORUS_DEPTH, CHORUSFX_POSITION, "Chorus Depth", &values_0_to_99,}, diff --git a/gdigi.c b/gdigi.c index 77ac66d..1d1ae3c 100644 --- a/gdigi.c +++ b/gdigi.c @@ -144,8 +144,8 @@ format_value (XmlSettings *xml, guint value) { char *textp = map_xml_value(xml, values, value); if (!textp) { - g_warning("Unable to map %s value %d for id %d position %d", - xml->label, value, xml->id, xml->position); + g_warning("%s: Unable to map %s value %d for id %d position %d", + __FUNCTION__, xml->label, value, xml->id, xml->position); textp = ""; } g_string_printf(buf, "%s", textp);