summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/menus/eq_menu.c2
-rw-r--r--apps/settings_list.c94
2 files changed, 1 insertions, 95 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 79389ae561..109c3c9ab7 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -674,7 +674,7 @@ int eq_menu_graphical(void)
674 { 674 {
675 if (current_band == 0) { 675 if (current_band == 0) {
676 start_item = 0; 676 start_item = 0;
677 } else if (current_band == 9) { 677 } else if (current_band == EQ_NUM_BANDS - 1) {
678 start_item = EQ_NUM_BANDS - nb_eq_sliders[i]; 678 start_item = EQ_NUM_BANDS - nb_eq_sliders[i];
679 } else { 679 } else {
680 start_item = current_band - 1; 680 start_item = current_band - 1;
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[] = {
1576 "eq precut", UNIT_DB, 0, 240, 1, eq_precut_format, 1576 "eq precut", UNIT_DB, 0, 240, 1, eq_precut_format,
1577 get_precut_talkid, dsp_set_eq_precut), 1577 get_precut_talkid, dsp_set_eq_precut),
1578 1578
1579 /* 0..32768 Hz */
1580 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].cutoff, LANG_EQUALIZER_BAND_CUTOFF,
1581 32, "eq band 0 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1582 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1583 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].cutoff, LANG_EQUALIZER_BAND_CENTER,
1584 64, "eq band 1 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1585 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1586 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].cutoff, LANG_EQUALIZER_BAND_CENTER,
1587 125, "eq band 2 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1588 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1589 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].cutoff, LANG_EQUALIZER_BAND_CENTER,
1590 250, "eq band 3 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1591 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1592 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].cutoff, LANG_EQUALIZER_BAND_CENTER,
1593 500, "eq band 4 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1594 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1595 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].cutoff, LANG_EQUALIZER_BAND_CENTER,
1596 1000, "eq band 5 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1597 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1598 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].cutoff, LANG_EQUALIZER_BAND_CENTER,
1599 2000, "eq band 6 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1600 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1601 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].cutoff, LANG_EQUALIZER_BAND_CENTER,
1602 4000, "eq band 7 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1603 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1604 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].cutoff, LANG_EQUALIZER_BAND_CENTER,
1605 8000, "eq band 8 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1606 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1607 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].cutoff, LANG_EQUALIZER_BAND_CUTOFF,
1608 16000, "eq band 9 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
1609 EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
1610 /* 0..64 (or 0.0 to 6.4) */
1611 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].q, LANG_EQUALIZER_BAND_Q, 7,
1612 "eq band 0 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1613 eq_q_format, get_dec_talkid, NULL),
1614 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].q, LANG_EQUALIZER_BAND_Q, 10,
1615 "eq band 1 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1616 eq_q_format, get_dec_talkid, NULL),
1617 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].q, LANG_EQUALIZER_BAND_Q, 10,
1618 "eq band 2 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1619 eq_q_format, get_dec_talkid, NULL),
1620 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].q, LANG_EQUALIZER_BAND_Q, 10,
1621 "eq band 3 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1622 eq_q_format, get_dec_talkid, NULL),
1623 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].q, LANG_EQUALIZER_BAND_Q, 10,
1624 "eq band 4 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1625 eq_q_format, get_dec_talkid, NULL),
1626 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].q, LANG_EQUALIZER_BAND_Q, 10,
1627 "eq band 5 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1628 eq_q_format, get_dec_talkid, NULL),
1629 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].q, LANG_EQUALIZER_BAND_Q, 10,
1630 "eq band 6 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1631 eq_q_format, get_dec_talkid, NULL),
1632 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].q, LANG_EQUALIZER_BAND_Q, 10,
1633 "eq band 7 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1634 eq_q_format, get_dec_talkid, NULL),
1635 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].q, LANG_EQUALIZER_BAND_Q, 10,
1636 "eq band 8 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1637 eq_q_format, get_dec_talkid, NULL),
1638 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].q, LANG_EQUALIZER_BAND_Q, 7,
1639 "eq band 9 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
1640 eq_q_format, get_dec_talkid, NULL),
1641 /* -240..240 (or -24db to +24db) */
1642 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[0].gain, LANG_GAIN, 0,
1643 "eq band 0 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1644 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1645 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[1].gain, LANG_GAIN, 0,
1646 "eq band 1 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1647 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1648 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[2].gain, LANG_GAIN, 0,
1649 "eq band 2 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1650 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1651 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[3].gain, LANG_GAIN, 0,
1652 "eq band 3 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1653 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1654 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[4].gain, LANG_GAIN, 0,
1655 "eq band 4 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1656 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1657 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[5].gain, LANG_GAIN, 0,
1658 "eq band 5 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1659 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1660 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[6].gain, LANG_GAIN, 0,
1661 "eq band 6 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1662 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1663 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[7].gain, LANG_GAIN, 0,
1664 "eq band 7 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1665 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1666 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[8].gain, LANG_GAIN, 0,
1667 "eq band 8 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1668 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1669 INT_SETTING_NOWRAP(F_DEPRECATED|F_EQSETTING, eq_band_settings[9].gain, LANG_GAIN, 0,
1670 "eq band 9 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
1671 EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
1672
1673#define EQ_BAND(id, string) \ 1579#define EQ_BAND(id, string) \
1674 CUSTOM_SETTING(F_EQSETTING, eq_band_settings[id], -1, \ 1580 CUSTOM_SETTING(F_EQSETTING, eq_band_settings[id], -1, \
1675 &eq_defaults[id], string, \ 1581 &eq_defaults[id], string, \
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-02 16:31:19 +0000