diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-03-09 16:38:33 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-03-12 00:18:33 +0100 |
commit | f6370726323c5e3351d23341be9fc0a5af950a67 (patch) | |
tree | 1a74e96a494f68cadddec9942b600c98bdd9bd49 /apps/settings_list.c | |
parent | 64bb720edf8a738685c9f0a18957a1b15e984cf6 (diff) | |
download | rockbox-f6370726323c5e3351d23341be9fc0a5af950a67.tar.gz rockbox-f6370726323c5e3351d23341be9fc0a5af950a67.zip |
Change EQ settings to use a struct array in global_settings.
The previous pseudo array access of separate members wasn't very
nice or clear.
Change-Id: I74a2b39bb9c71a1370a455c01c4d5a860765e040
Reviewed-on: http://gerrit.rockbox.org/179
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 5e4a07c6ee..27cece5550 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1420,51 +1420,51 @@ const struct settings_list settings[] = { | |||
1420 | "eq precut", UNIT_DB, 0, 240, 5, eq_precut_format, | 1420 | "eq precut", UNIT_DB, 0, 240, 5, eq_precut_format, |
1421 | get_precut_talkid, dsp_set_eq_precut), | 1421 | get_precut_talkid, dsp_set_eq_precut), |
1422 | /* 0..32768 Hz */ | 1422 | /* 0..32768 Hz */ |
1423 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, | 1423 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[0].cutoff, LANG_EQUALIZER_BAND_CUTOFF, |
1424 | 60, "eq band 0 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, | 1424 | 60, "eq band 0 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, |
1425 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), | 1425 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), |
1426 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, | 1426 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[1].cutoff, LANG_EQUALIZER_BAND_CENTER, |
1427 | 200, "eq band 1 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, | 1427 | 200, "eq band 1 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, |
1428 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), | 1428 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), |
1429 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, | 1429 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[2].cutoff, LANG_EQUALIZER_BAND_CENTER, |
1430 | 800, "eq band 2 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, | 1430 | 800, "eq band 2 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, |
1431 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), | 1431 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), |
1432 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, | 1432 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[3].cutoff, LANG_EQUALIZER_BAND_CENTER, |
1433 | 4000, "eq band 3 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, | 1433 | 4000, "eq band 3 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, |
1434 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), | 1434 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), |
1435 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, | 1435 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[4].cutoff, LANG_EQUALIZER_BAND_CUTOFF, |
1436 | 12000, "eq band 4 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, | 1436 | 12000, "eq band 4 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN, |
1437 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), | 1437 | EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL), |
1438 | /* 0..64 (or 0.0 to 6.4) */ | 1438 | /* 0..64 (or 0.0 to 6.4) */ |
1439 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7, | 1439 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[0].q, LANG_EQUALIZER_BAND_Q, 7, |
1440 | "eq band 0 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 1440 | "eq band 0 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
1441 | eq_q_format, get_dec_talkid, NULL), | 1441 | eq_q_format, get_dec_talkid, NULL), |
1442 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, | 1442 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[1].q, LANG_EQUALIZER_BAND_Q, 10, |
1443 | "eq band 1 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 1443 | "eq band 1 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
1444 | eq_q_format, get_dec_talkid, NULL), | 1444 | eq_q_format, get_dec_talkid, NULL), |
1445 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, | 1445 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[2].q, LANG_EQUALIZER_BAND_Q, 10, |
1446 | "eq band 2 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 1446 | "eq band 2 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
1447 | eq_q_format, get_dec_talkid, NULL), | 1447 | eq_q_format, get_dec_talkid, NULL), |
1448 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, | 1448 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[3].q, LANG_EQUALIZER_BAND_Q, 10, |
1449 | "eq band 3 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 1449 | "eq band 3 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
1450 | eq_q_format, get_dec_talkid, NULL), | 1450 | eq_q_format, get_dec_talkid, NULL), |
1451 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, | 1451 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[4].q, LANG_EQUALIZER_BAND_Q, 7, |
1452 | "eq band 4 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 1452 | "eq band 4 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
1453 | eq_q_format, get_dec_talkid, NULL), | 1453 | eq_q_format, get_dec_talkid, NULL), |
1454 | /* -240..240 (or -24db to +24db) */ | 1454 | /* -240..240 (or -24db to +24db) */ |
1455 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band0_gain, LANG_GAIN, 0, | 1455 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[0].gain, LANG_GAIN, 0, |
1456 | "eq band 0 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, | 1456 | "eq band 0 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, |
1457 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), | 1457 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), |
1458 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band1_gain, LANG_GAIN, 0, | 1458 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[1].gain, LANG_GAIN, 0, |
1459 | "eq band 1 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, | 1459 | "eq band 1 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, |
1460 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), | 1460 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), |
1461 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band2_gain, LANG_GAIN, 0, | 1461 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[2].gain, LANG_GAIN, 0, |
1462 | "eq band 2 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, | 1462 | "eq band 2 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, |
1463 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), | 1463 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), |
1464 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band3_gain, LANG_GAIN, 0, | 1464 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[3].gain, LANG_GAIN, 0, |
1465 | "eq band 3 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, | 1465 | "eq band 3 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, |
1466 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), | 1466 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), |
1467 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_gain, LANG_GAIN, 0, | 1467 | INT_SETTING_NOWRAP(F_EQSETTING, eq_band_settings[4].gain, LANG_GAIN, 0, |
1468 | "eq band 4 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, | 1468 | "eq band 4 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, |
1469 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), | 1469 | EQ_GAIN_STEP, db_format, get_dec_talkid, NULL), |
1470 | 1470 | ||