diff --git a/effects.c b/effects.c index b7cb14c..31610e4 100644 --- a/effects.c +++ b/effects.c @@ -3966,6 +3966,130 @@ static XmlLabel xml_fx_lib_labels[] = { static XmlLabel xml_rhold_labels[] = { {100, "RHold"}, }; +static XmlLabel xml_eq_low_freq_labels[] = { + {0, "60Hz"}, + {1, "63Hz"}, + {2, "67Hz"}, + {3, "71Hz"}, + {4, "75Hz"}, + {5, "80Hz"}, + {6, "85Hz"}, + {7, "90Hz"}, + {8, "95Hz"}, + {9, "100Hz"}, + {11, "106Hz"}, + {12, "112Hz"}, + {13, "118Hz"}, + {14, "125Hz"}, + {15, "132Hz"}, + {16, "140Hz"}, + {17, "150Hz"}, + {18, "160Hz"}, + {19, "170Hz"}, + {20, "180Hz"}, + {21, "190Hz"}, + {22, "200Hz"}, + {23, "212Hz"}, + {24, "224Hz"}, + {25, "236Hz"}, + {26, "250Hz"}, + {27, "265Hz"}, + {28, "280Hz"}, + {29, "300Hz"}, + {30, "315Hz"}, + {31, "335Hz"}, + {32, "355Hz"}, + {33, "375Hz"}, + {34, "400Hz"}, + {35, "425Hz"}, + {36, "450Hz"}, + {37, "475Hz"}, + {38, "500Hz"}, +}; + +static XmlLabel xml_eq_mid_freq_labels[] = { + {0, "300Hz"}, + {1, "315Hz"}, + {2, "335Hz"}, + {3, "355Hz"}, + {4, "375Hz"}, + {5, "400Hz"}, + {6, "425Hz"}, + {7, "450Hz"}, + {8, "475Hz"}, + {9, "500Hz"}, + {0, "530Hz"}, + {11, "560Hz"}, + {12, "600Hz"}, + {13, "630Hz"}, + {15, "670Hz"}, + {16, "710Hz"}, + {17, "750Hz"}, + {18, "800Hz"}, + {19, "850Hz"}, + {20, "900Hz"}, + {21, "950Hz"}, + {22, "1kHz"}, + {23, "1.06kHz"}, + {24, "1.12kHz"}, + {25, "1.18kHz"}, + {26, "1.25kHz"}, + {27, "1.32kHz"}, + {28, "1.4kHz"}, + {29, "1.5kHz"}, + {30, "1.6kHz"}, + {31, "1.7kHz"}, + {32, "1.8kHz"}, + {33, "1.9kHz"}, + {34, "2kHz"}, + {35, "2.12kHz"}, + {36, "2.24kHz"}, + {37, "2.36kHz"}, + {38, "2.5kHz"}, + {39, "2.65kHz"}, + {40, "2.8kHz"}, + {41, "3kHz"}, + {42, "3.15kHz"}, + {43, "3.35kHz"}, + {44, "3.55kHz"}, + {45, "3.75kHz"}, + {46, "4kHz"}, +}; + +static XmlLabel xml_eq_high_freq_labels[] = { + {0, "2kHz"}, + {1, "2.12kHz"}, + {2,"2.24kHz"}, + {3, "2.36kHz"}, + {4, "2.5kHz"}, + {5, "2.65kHz"}, + {6, "2.8kHz"}, + {7, "3kHz"}, + {8, "3.15kHz"}, + {9, "3.35kHz"}, + {10, "3.55kHz"}, + {11, "3.75kHz"}, + {12, "4kHz"}, + {13, "4.25kHz"}, + {14, "4.5kHz"}, + {15, "4.75kHz"}, + {16, "5kHz"}, + {17, "5.3kHz"}, + {18, "5.6kHz"}, + {19, "6kHz"}, + {20, "6.3kHz"}, + {21, "6.7kHz"}, + {22, "7.1kHz"}, + {23, "7.5kHz"}, + {24, "8kHz"}, +}; + +static XmlLabel xml_eq_bandwidth_labels[] = { + {0, "Wide"}, + {1, "Medium"}, + {2, "Narrow"}, +}; + /* Array to map id/position pairs to labels and settings. */ XmlSettings xml_settings[] = { {0, 0, "None", NULL,}, @@ -4038,7 +4162,6 @@ XmlSettings xml_settings[] = { {AMP_GAIN, AMP_B_POSITION, "Amp B Gain", &values_0_to_99,}, {AMP_LEVEL, AMP_B_POSITION, "Amp B Level", &values_0_to_99,}, - {AMP_BASS, AMP_A_POSITION, "Amp B Level", &values_1_to_10_step_0p1,}, {AMP_MID, AMP_A_POSITION, "Amp B Level", &values_1_to_10_step_0p1,}, {AMP_TREBLE, AMP_A_POSITION, "Amp B Level", &values_1_to_10_step_0p1,}, @@ -4180,6 +4303,7 @@ XmlSettings xml_settings[] = { {DELAY_DEPTH, DELAY_POSITION, "Delay Mod Depth", &values_0_to_99,}, {DELAY_TAPE_WOW, DELAY_POSITION, "Delay Tape Wow", &values_0_to_99,}, {DELAY_TAPE_FLUTTER, DELAY_POSITION, "Delay Tape Flut", &values_0_to_99,}, + {DELAY_TAP_TIME_0_4990, DELAY_POSITION, "Tap Time", &values_delay_time_0_4990,}, {REVERB_TYPE, REVERB_POSITION, "Reverb Type", &values_reverb_type, xml_reverb_labels, G_N_ELEMENTS(xml_reverb_labels)}, {REVERB_ON_OFF, REVERB_POSITION, "Reverb Enable", &values_on_off, xml_on_off_labels, G_N_ELEMENTS(xml_on_off_labels)}, @@ -4226,18 +4350,23 @@ XmlSettings xml_settings[] = { {EQ_ENABLE, EQ_A_POSITION, "EQ A Enable", &values_on_off, xml_on_off_labels, G_N_ELEMENTS(xml_on_off_labels)}, {EQ_TYPE, EQ_A_POSITION, "EQ A Type", &values_eq_type, xml_eq_labels, G_N_ELEMENTS(xml_eq_labels)}, + {EQ_BASS, EQ_A_POSITION, "EQ A Bass", &values_eq_db,}, {EQ_MID, EQ_A_POSITION, "EQ A Mid", &values_eq_db,}, {EQ_TREB, EQ_A_POSITION, "EQ A Treb", &values_eq_db,}, + {EQ_PRESENCE, EQ_A_POSITION, "EQ A Presence", &values_eq_db,}, {EQ_MID_FREQ, EQ_A_POSITION, "EQ A Mid Freq", &values_eq_mid_hz,}, {EQ_TREB_FREQ, EQ_A_POSITION, "EQ A Treb Freq", &values_eq_treb_hz,}, // RP500 values - {EQ_LOW_FREQ, EQ_A_POSITION, "EQ A Low Freq", &values_eq_low_freq,}, - {EQ_MID_FREQ_RP500, EQ_A_POSITION, "EQ A Mid Freq", &values_eq_mid_freq,}, - {EQ_HIGH_FREQ, EQ_A_POSITION, "EQ A High Freq", &values_eq_high_freq,}, + {EQ_LOW_FREQ, EQ_A_POSITION, "EQ A Low Freq", &values_eq_low_freq, xml_eq_low_freq_labels, G_N_ELEMENTS(xml_eq_low_freq_labels)}, + {EQ_MID_FREQ_RP500, EQ_A_POSITION, "EQ A Mid Freq", &values_eq_mid_freq, xml_eq_mid_freq_labels, G_N_ELEMENTS(xml_eq_mid_freq_labels)}, + {EQ_HIGH_FREQ, EQ_A_POSITION, "EQ A High Freq", &values_eq_high_freq, xml_eq_high_freq_labels, G_N_ELEMENTS(xml_eq_high_freq_labels)}, + {EQ_LOW_BANDWIDTH, EQ_A_POSITION, "Low Bandwidth", &values_eq_bandwidth, xml_eq_bandwidth_labels, G_N_ELEMENTS(xml_eq_bandwidth_labels)}, + {EQ_MID_BANDWIDTH, EQ_A_POSITION, "Mid Bandwidth", &values_eq_bandwidth, xml_eq_bandwidth_labels, G_N_ELEMENTS(xml_eq_bandwidth_labels)}, + {EQ_HIGH_BANDWIDTH, EQ_A_POSITION, "High Bandwidth", &values_eq_bandwidth, xml_eq_bandwidth_labels, G_N_ELEMENTS(xml_eq_bandwidth_labels)}, {EQ_ENABLE, EQ_B_POSITION, "EQ B Enable", &values_on_off, xml_on_off_labels, G_N_ELEMENTS(xml_on_off_labels)}, {EQ_TYPE, EQ_B_POSITION, "EQ B Type", &values_eq_type, xml_eq_labels, G_N_ELEMENTS(xml_eq_labels)},