From 9f4bd66217e4955c6e1a0b16e5c6667ee8cd7d2f Mon Sep 17 00:00:00 2001 From: Tim LaBerge Date: Thu, 26 Dec 2013 10:20:53 -0800 Subject: [PATCH] Remove duplicate RP1000 code. Support for RP1000 has been merged upstream, so the rp1000 changes in this branch are unneeded. --- effects.c | 3 --- gui.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/effects.c b/effects.c index d9fe808..4aac730 100644 --- a/effects.c +++ b/effects.c @@ -3408,7 +3408,6 @@ static Modifier modifiers[] = { {"Amp B Enable", AMP_ON_OFF, AMP_B_POSITION, &values_on_off}, {"Amp B Gain", AMP_GAIN, AMP_B_POSITION, &values_0_to_99}, {"Amp B Level", AMP_LEVEL, AMP_B_POSITION, &values_0_to_99}, - {"Amp Loop Enable", AMP_LOOP_ON_OFF, AMP_LOOP_POSITION, &values_on_off}, {"EQ Enable", EQ_ENABLE, EQ_A_POSITION, &values_on_off}, {"EQ Bass", EQ_BASS, EQ_A_POSITION, &values_eq_db}, {"EQ Mid", EQ_MID, EQ_A_POSITION, &values_eq_db}, @@ -4207,8 +4206,6 @@ XmlSettings xml_settings[] = { {AMP_CAB_TYPE, AMP_CAB_POSITION, "Cab A Type", &values_cab_type, xml_amp_cab_labels, G_N_ELEMENTS(xml_amp_cab_labels)}, {AMP_CAB_TYPE, AMP_CAB_B_POSITION, "Cab B Type", &values_cab_type, xml_amp_cab_labels, G_N_ELEMENTS(xml_amp_cab_labels)}, - {AMP_LOOP_ON_OFF, AMP_LOOP_POSITION, "Amp Loop Enable", &values_on_off, xml_on_off_labels, G_N_ELEMENTS(xml_on_off_labels)}, - {NOISEGATE_TYPE, NOISEGATE_POSITION, "Gate Type", &values_gate_type, xml_noisegate_labels, G_N_ELEMENTS(xml_noisegate_labels)}, {NOISEGATE_ON_OFF, NOISEGATE_POSITION, "Gate Enable", &values_on_off, xml_on_off_labels, G_N_ELEMENTS(xml_on_off_labels)}, {NOISEGATE_SWELL_SENS, NOISEGATE_POSITION, "Gate Pluck Sens", &values_0_to_99,}, diff --git a/gui.c b/gui.c index 4ba2619..b30746a 100644 --- a/gui.c +++ b/gui.c @@ -757,14 +757,13 @@ static void update_modifier_vbox(GtkWidget *vbox, GObject *combo_box, gint id, g for (x = 0; xid = id; settings->type = group[x].type; settings->position = position; - g_assert(group[x].label); - if (position == EXP_POSITION) { child = g_object_steal_data(G_OBJECT(combo_box), "active_child"); child = create_grid(group[x].settings, group[x].settings_amt,