summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-07-06 17:14:02 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-07-06 17:14:02 -0400
commit19b289a1b9967b697b54f20f12c1d3a1e44b6e39 (patch)
tree06d97c3a69e640e611c43e3d477c485488c1a0de /apps/settings_list.c
parent228372c38df91e24d3fc3185c50db95d05f5dc74 (diff)
downloadrockbox-19b289a1b9967b697b54f20f12c1d3a1e44b6e39.tar.gz
rockbox-19b289a1b9967b697b54f20f12c1d3a1e44b6e39.zip
Reuse frequency string from recording for playback frequency.
Update all .lang files and change the id from LANG_RECORDING_FREQUENCY to LANG_FREQUENCY. Also update description and target. It will throw things off for targets without recording but that do have 48KHz, possibly older iPods. I'm not sure what else it might be off hand. Regenerate voice files and replace .lang files in that case. Change-Id: I9ab396ecfcca9206054bde34aa2cc23b505dabff
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 980c74f0a7..7b42b4ed8a 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -808,7 +808,7 @@ const struct settings_list settings[] = {
808#endif 808#endif
809 ), /* CHOICE_SETTING( repeat_mode ) */ 809 ), /* CHOICE_SETTING( repeat_mode ) */
810#ifdef HAVE_PLAY_FREQ 810#ifdef HAVE_PLAY_FREQ
811 STRINGCHOICE_SETTING(0, play_frequency, LANG_PLAYBACK_FREQUENCY, 0, 811 STRINGCHOICE_SETTING(0, play_frequency, LANG_FREQUENCY, 0,
812 "playback frequency", "44.1 kHz,48 kHz", NULL, 2, 812 "playback frequency", "44.1 kHz,48 kHz", NULL, 2,
813 TALK_ID_DECIMAL(441, 1, UNIT_KHZ), TALK_ID(48, UNIT_KHZ)), 813 TALK_ID_DECIMAL(441, 1, UNIT_KHZ), TALK_ID(48, UNIT_KHZ)),
814#endif /* HAVE_PLAY_FREQ */ 814#endif /* HAVE_PLAY_FREQ */
@@ -1338,8 +1338,8 @@ const struct settings_list settings[] = {
1338#endif /* DEFAULT_REC_RIGHT_GAIN */ 1338#endif /* DEFAULT_REC_RIGHT_GAIN */
1339#if CONFIG_CODEC == MAS3587F 1339#if CONFIG_CODEC == MAS3587F
1340 {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, 1340 {F_T_INT|F_RECSETTING,&global_settings.rec_frequency,
1341 LANG_RECORDING_FREQUENCY, INT(0), 1341 LANG_FREQUENCY, INT(0), "rec frequency",
1342 "rec frequency","44,48,32,22,24,16", UNUSED}, 1342 "44,48,32,22,24,16", UNUSED},
1343 INT_SETTING(F_RECSETTING, rec_quality, LANG_RECORDING_QUALITY, 5, 1343 INT_SETTING(F_RECSETTING, rec_quality, LANG_RECORDING_QUALITY, 5,
1344 "rec quality", UNIT_INT, 0, 7, 1, NULL, NULL, NULL), 1344 "rec quality", UNIT_INT, 0, 7, 1, NULL, NULL, NULL),
1345 OFFON_SETTING(F_RECSETTING, rec_editable, LANG_RECORDING_EDITABLE, false, 1345 OFFON_SETTING(F_RECSETTING, rec_editable, LANG_RECORDING_EDITABLE, false,
@@ -1347,7 +1347,7 @@ const struct settings_list settings[] = {
1347#endif /* CONFIG_CODEC == MAS3587F */ 1347#endif /* CONFIG_CODEC == MAS3587F */
1348#if CONFIG_CODEC == SWCODEC 1348#if CONFIG_CODEC == SWCODEC
1349 {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, 1349 {F_T_INT|F_RECSETTING,&global_settings.rec_frequency,
1350 LANG_RECORDING_FREQUENCY,INT(REC_FREQ_DEFAULT), 1350 LANG_FREQUENCY,INT(REC_FREQ_DEFAULT),
1351 "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED}, 1351 "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED},
1352 {F_T_INT|F_RECSETTING,&global_settings.rec_format, 1352 {F_T_INT|F_RECSETTING,&global_settings.rec_format,
1353 LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT), 1353 LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT),