gentoo/boudigi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove USB settings from effect list as they're not part of Preset

Browse Source
This commit is contained in:
Tomasz Moń
2009-09-20 19:57:39 +02:00
parent 158fd081a5
commit 530dd397c5
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
effects.c
View File

@@ -490,6 +490,9 @@ static EffectValues values_rp_mix = {
static EffectSettings usb_settings[] = { static EffectSettings usb_settings[] = {
{"USB/RP Mix", USB_AUDIO_PLAYBACK_MIX, USB_POSITION, &values_rp_mix}, {"USB/RP Mix", USB_AUDIO_PLAYBACK_MIX, USB_POSITION, &values_rp_mix},
{"USB Level", USB_AUDIO_LEVEL, USB_POSITION, &values_m12_to_24}, {"USB Level", USB_AUDIO_LEVEL, USB_POSITION, &values_m12_to_24},
};
static EffectSettings misc_settings[] = {
{"Preset Level", PRESET_LEVEL, PRESET_POSITION, &values_0_to_99}, {"Preset Level", PRESET_LEVEL, PRESET_POSITION, &values_0_to_99},
}; };
@@ -1299,10 +1302,15 @@ static EffectGroup gnx3k_amp_channel_group[] = {
{-1, NULL, gnx3k_amp_channel_settings, G_N_ELEMENTS(gnx3k_amp_channel_settings)}, {-1, NULL, gnx3k_amp_channel_settings, G_N_ELEMENTS(gnx3k_amp_channel_settings)},
}; };
/** \todo it's not part of Preset, but should appear in GUI */
static EffectGroup usb_group[] = { static EffectGroup usb_group[] = {
{-1, NULL, usb_settings, G_N_ELEMENTS(usb_settings)}, {-1, NULL, usb_settings, G_N_ELEMENTS(usb_settings)},
}; };
static EffectGroup misc_group[] = {
{-1, NULL, misc_settings, G_N_ELEMENTS(misc_settings)},
};
static EffectGroup gnx3k_preset_group[] = { static EffectGroup gnx3k_preset_group[] = {
{-1, NULL, gnx3k_preset_settings, G_N_ELEMENTS(gnx3k_preset_settings)}, {-1, NULL, gnx3k_preset_settings, G_N_ELEMENTS(gnx3k_preset_settings)},
}; };
@@ -2205,9 +2213,9 @@ static Effect rp500_eq_effect[] = {
{"Enable Equalizer", EQ_ON_OFF, -1, EQ_POSITION, rp500_eq_group, G_N_ELEMENTS(rp500_eq_group)}, {"Enable Equalizer", EQ_ON_OFF, -1, EQ_POSITION, rp500_eq_group, G_N_ELEMENTS(rp500_eq_group)},
}; };
static Effect pickup_usb_effect[] = { static Effect pickup_misc_effect[] = {
{NULL, PICKUP_ON_OFF, PICKUP_TYPE, PICKUP_POSITION, pickup_group, G_N_ELEMENTS(pickup_group)}, {NULL, PICKUP_ON_OFF, PICKUP_TYPE, PICKUP_POSITION, pickup_group, G_N_ELEMENTS(pickup_group)},
{NULL, -1, -1, -1, usb_group, G_N_ELEMENTS(usb_group)}, {NULL, -1, -1, -1, misc_group, G_N_ELEMENTS(misc_group)},
}; };
static Effect pickup_effect[] = { static Effect pickup_effect[] = {
@@ -2228,11 +2236,11 @@ static EffectList rp250_effects[] = {
{"Chorus/FX", rp250_chorusfx_effect, G_N_ELEMENTS(rp250_chorusfx_effect)}, {"Chorus/FX", rp250_chorusfx_effect, G_N_ELEMENTS(rp250_chorusfx_effect)},
{"Delay", rp250_delay_effect, G_N_ELEMENTS(rp250_delay_effect)}, {"Delay", rp250_delay_effect, G_N_ELEMENTS(rp250_delay_effect)},
{"Reverb", reverb_effect, G_N_ELEMENTS(reverb_effect)}, {"Reverb", reverb_effect, G_N_ELEMENTS(reverb_effect)},
{"Pickup/USB", pickup_usb_effect, G_N_ELEMENTS(pickup_usb_effect)}, {"Pickup/Misc", pickup_misc_effect, G_N_ELEMENTS(pickup_misc_effect)},
}; };
static EffectList rp355_effects[] = { static EffectList rp355_effects[] = {
{"Pickup/USB", pickup_usb_effect, G_N_ELEMENTS(pickup_usb_effect)}, {"Pickup/Misc", pickup_misc_effect, G_N_ELEMENTS(pickup_misc_effect)},
{"Wah", wah_effect, G_N_ELEMENTS(wah_effect)}, {"Wah", wah_effect, G_N_ELEMENTS(wah_effect)},
{"Compressor", rp355_comp_effect, G_N_ELEMENTS(rp355_comp_effect)}, {"Compressor", rp355_comp_effect, G_N_ELEMENTS(rp355_comp_effect)},
{"Distortion", rp355_dist_effect, G_N_ELEMENTS(rp355_dist_effect)}, {"Distortion", rp355_dist_effect, G_N_ELEMENTS(rp355_dist_effect)},

3
gui.c
View File

@@ -474,7 +474,8 @@ GtkWidget *create_vbox(Effect *widgets, gint amt, gchar *label)
y = 0; y = 0;
} else { } else {
/* Default to 1 */ /* Default to 1 */
y = 1; if (x == 0)
y = 1;
} }
container = create_widget_container(widgets[x].group, widgets[x].group_amt, widgets[x].type, widgets[x].position); container = create_widget_container(widgets[x].group, widgets[x].group_amt, widgets[x].type, widgets[x].position);