From 6322e66219baba3fea7f4ec3cc622674f2f340f3 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 25 Aug 2021 21:47:29 +0100 Subject: Remove long-deprecated old style EQ settings These were deprecated by 1eb17dc9f4 back in 2013 just prior to the 3.13 release. We've had 3.14 and 3.15 since then and I guess nobody will complain if we finally remove them (fingers crossed...) Also fix a line which got missed when converting hardcoded numbers to EQ_NUM_BANDS in that commit. Change-Id: I79dd71f1f2810bf19bc135999868fafc5fee6e04 --- apps/settings_list.c | 94 ---------------------------------------------------- 1 file changed, 94 deletions(-) (limited to 'apps/settings_list.c') diff --git a/apps/settings_list.c b/apps/settings_list.c index ab99b58a1c..4c92bb4322 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1576,100 +1576,6 @@ const struct settings_list settings[] = { "eq precut", UNIT_DB, 0, 240, 1, eq_precut_format, get_precut_talkid, dsp_set_eq_precut), - /* 0..32768 Hz */ - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].cutoff, LANG_EQUALIZER_BAND_CUTOFF, - 32, "eq band 0 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].cutoff, LANG_EQUALIZER_BAND_CENTER, - 64, "eq band 1 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].cutoff, LANG_EQUALIZER_BAND_CENTER, - 125, "eq band 2 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].cutoff, LANG_EQUALIZER_BAND_CENTER, - 250, "eq band 3 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].cutoff, LANG_EQUALIZER_BAND_CENTER, - 500, "eq band 4 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].cutoff, LANG_EQUALIZER_BAND_CENTER, - 1000, "eq band 5 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].cutoff, LANG_EQUALIZER_BAND_CENTER, - 2000, "eq band 6 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].cutoff, LANG_EQUALIZER_BAND_CENTER, - 4000, "eq band 7 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].cutoff, LANG_EQUALIZER_BAND_CENTER, - 8000, "eq band 8 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].cutoff, LANG_EQUALIZER_BAND_CUTOFF, - 16000, "eq band 9 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, - EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), - /* 0..64 (or 0.0 to 6.4) */ - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].q, LANG_EQUALIZER_BAND_Q, 7, - "eq band 0 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 1 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 2 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 3 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 4 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 5 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 6 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 7 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].q, LANG_EQUALIZER_BAND_Q, 10, - "eq band 8 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].q, LANG_EQUALIZER_BAND_Q, 7, - "eq band 9 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, - eq_q_format, get_dec_talkid, NULL), - /* -240..240 (or -24db to +24db) */ - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].gain, LANG_GAIN, 0, - "eq band 0 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].gain, LANG_GAIN, 0, - "eq band 1 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].gain, LANG_GAIN, 0, - "eq band 2 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].gain, LANG_GAIN, 0, - "eq band 3 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].gain, LANG_GAIN, 0, - "eq band 4 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].gain, LANG_GAIN, 0, - "eq band 5 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].gain, LANG_GAIN, 0, - "eq band 6 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].gain, LANG_GAIN, 0, - "eq band 7 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].gain, LANG_GAIN, 0, - "eq band 8 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].gain, LANG_GAIN, 0, - "eq band 9 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, - EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), - #define EQ_BAND(id, string) \ CUSTOM_SETTING(F_EQSETTING, eq_band_settings[id], -1, \ &eq_defaults[id], string, \ -- cgit v1.2.3