diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-03-19 22:15:53 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-03-19 22:15:53 +0000 |
commit | fa97f161abc45bfd5db86bceb8803d2661e65447 (patch) | |
tree | 1e06ac8c47bd9165e46e85235f059372ddad2b90 /apps/settings_menu.c | |
parent | 239b70fad38be55075dd14ea8e3c0f6f54a1f35b (diff) | |
download | rockbox-fa97f161abc45bfd5db86bceb8803d2661e65447.tar.gz rockbox-fa97f161abc45bfd5db86bceb8803d2661e65447.zip |
Third step of the voice-UI: numerical settings are spoken (composed at runtime), needs new voicefont at the new location ".rockbox/langs/english.voice"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4414 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 209 |
1 files changed, 105 insertions, 104 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 64df007afe..e1dcf6582c 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "ata.h" | 40 | #include "ata.h" |
41 | #include "tree.h" | 41 | #include "tree.h" |
42 | #include "screens.h" | 42 | #include "screens.h" |
43 | #include "talk.h" | ||
43 | #ifdef HAVE_LCD_BITMAP | 44 | #ifdef HAVE_LCD_BITMAP |
44 | #include "peakmeter.h" | 45 | #include "peakmeter.h" |
45 | #endif | 46 | #endif |
@@ -167,23 +168,23 @@ static bool peak_meter_hold(void) { | |||
167 | bool retval = false; | 168 | bool retval = false; |
168 | struct opt_items names[] = { | 169 | struct opt_items names[] = { |
169 | { STR(LANG_OFF) }, | 170 | { STR(LANG_OFF) }, |
170 | { "200 ms " , -1 }, | 171 | { "200 ms " , TALK_ID(200, UNIT_MS) }, |
171 | { "300 ms " , -1 }, | 172 | { "300 ms " , TALK_ID(300, UNIT_MS) }, |
172 | { "500 ms " , -1 }, | 173 | { "500 ms " , TALK_ID(500, UNIT_MS) }, |
173 | { "1 s " , -1 }, | 174 | { "1 s" , TALK_ID(1, UNIT_SEC) }, |
174 | { "2 s " , -1 }, | 175 | { "2 s" , TALK_ID(2, UNIT_SEC) }, |
175 | { "3 s " , -1 }, | 176 | { "3 s" , TALK_ID(3, UNIT_SEC) }, |
176 | { "4 s " , -1 }, | 177 | { "4 s" , TALK_ID(4, UNIT_SEC) }, |
177 | { "5 s " , -1 }, | 178 | { "5 s" , TALK_ID(5, UNIT_SEC) }, |
178 | { "6 s " , -1 }, | 179 | { "6 s" , TALK_ID(6, UNIT_SEC) }, |
179 | { "7 s" , -1 }, | 180 | { "7 s" , TALK_ID(7, UNIT_SEC) }, |
180 | { "8 s" , -1 }, | 181 | { "8 s" , TALK_ID(8, UNIT_SEC) }, |
181 | { "9 s" , -1 }, | 182 | { "9 s" , TALK_ID(9, UNIT_SEC) }, |
182 | { "10 s" , -1 }, | 183 | { "10 s" , TALK_ID(10, UNIT_SEC) }, |
183 | { "15 s" , -1 }, | 184 | { "15 s" , TALK_ID(15, UNIT_SEC) }, |
184 | { "20 s" , -1 }, | 185 | { "20 s" , TALK_ID(20, UNIT_SEC) }, |
185 | { "30 s" , -1 }, | 186 | { "30 s" , TALK_ID(30, UNIT_SEC) }, |
186 | { "1 min" , -1 } | 187 | { "1 min" , TALK_ID(1, UNIT_MIN) } |
187 | }; | 188 | }; |
188 | retval = set_option( str(LANG_PM_PEAK_HOLD), | 189 | retval = set_option( str(LANG_PM_PEAK_HOLD), |
189 | &global_settings.peak_meter_hold, INT, names, | 190 | &global_settings.peak_meter_hold, INT, names, |
@@ -204,30 +205,30 @@ static bool peak_meter_clip_hold(void) { | |||
204 | 205 | ||
205 | struct opt_items names[] = { | 206 | struct opt_items names[] = { |
206 | { STR(LANG_PM_ETERNAL) }, | 207 | { STR(LANG_PM_ETERNAL) }, |
207 | { "1s " , -1 }, | 208 | { "1s " , TALK_ID(1, UNIT_SEC) }, |
208 | { "2s " , -1 }, | 209 | { "2s " , TALK_ID(2, UNIT_SEC) }, |
209 | { "3s " , -1 }, | 210 | { "3s " , TALK_ID(3, UNIT_SEC) }, |
210 | { "4s " , -1 }, | 211 | { "4s " , TALK_ID(4, UNIT_SEC) }, |
211 | { "5s " , -1 }, | 212 | { "5s " , TALK_ID(5, UNIT_SEC) }, |
212 | { "6s " , -1 }, | 213 | { "6s " , TALK_ID(6, UNIT_SEC) }, |
213 | { "7s " , -1 }, | 214 | { "7s " , TALK_ID(7, UNIT_SEC) }, |
214 | { "8s " , -1 }, | 215 | { "8s " , TALK_ID(8, UNIT_SEC) }, |
215 | { "9s " , -1 }, | 216 | { "9s " , TALK_ID(9, UNIT_SEC) }, |
216 | { "10s" , -1 }, | 217 | { "10s" , TALK_ID(10, UNIT_SEC) }, |
217 | { "15s" , -1 }, | 218 | { "15s" , TALK_ID(15, UNIT_SEC) }, |
218 | { "20s" , -1 }, | 219 | { "20s" , TALK_ID(20, UNIT_SEC) }, |
219 | { "25s" , -1 }, | 220 | { "25s" , TALK_ID(25, UNIT_SEC) }, |
220 | { "30s" , -1 }, | 221 | { "30s" , TALK_ID(30, UNIT_SEC) }, |
221 | { "45s" , -1 }, | 222 | { "45s" , TALK_ID(45, UNIT_SEC) }, |
222 | { "60s" , -1 }, | 223 | { "60s" , TALK_ID(60, UNIT_SEC) }, |
223 | { "90s" , -1 }, | 224 | { "90s" , TALK_ID(90, UNIT_SEC) }, |
224 | { "2min" , -1 }, | 225 | { "2min" , TALK_ID(2, UNIT_MIN) }, |
225 | { "3min" , -1 }, | 226 | { "3min" , TALK_ID(3, UNIT_MIN) }, |
226 | { "5min" , -1 }, | 227 | { "5min" , TALK_ID(5, UNIT_MIN) }, |
227 | { "10min" , -1 }, | 228 | { "10min" , TALK_ID(10, UNIT_MIN) }, |
228 | { "20min" , -1 }, | 229 | { "20min" , TALK_ID(20, UNIT_MIN) }, |
229 | { "45min" , -1 }, | 230 | { "45min" , TALK_ID(45, UNIT_MIN) }, |
230 | { "90min" , -1 } | 231 | { "90min" , TALK_ID(90, UNIT_MIN) } |
231 | }; | 232 | }; |
232 | retval = set_option( str(LANG_PM_CLIP_HOLD), | 233 | retval = set_option( str(LANG_PM_CLIP_HOLD), |
233 | &global_settings.peak_meter_clip_hold, INT, names, | 234 | &global_settings.peak_meter_clip_hold, INT, names, |
@@ -531,23 +532,23 @@ static bool backlight_timer(void) | |||
531 | struct opt_items names[] = { | 532 | struct opt_items names[] = { |
532 | { STR(LANG_OFF) }, | 533 | { STR(LANG_OFF) }, |
533 | { STR(LANG_ON) }, | 534 | { STR(LANG_ON) }, |
534 | { "1s ", -1 }, | 535 | { "1s ", TALK_ID(1, UNIT_SEC) }, |
535 | { "2s ", -1 }, | 536 | { "2s ", TALK_ID(2, UNIT_SEC) }, |
536 | { "3s ", -1 }, | 537 | { "3s ", TALK_ID(3, UNIT_SEC) }, |
537 | { "4s ", -1 }, | 538 | { "4s ", TALK_ID(4, UNIT_SEC) }, |
538 | { "5s ", -1 }, | 539 | { "5s ", TALK_ID(5, UNIT_SEC) }, |
539 | { "6s ", -1 }, | 540 | { "6s ", TALK_ID(6, UNIT_SEC) }, |
540 | { "7s ", -1 }, | 541 | { "7s ", TALK_ID(7, UNIT_SEC) }, |
541 | { "8s ", -1 }, | 542 | { "8s ", TALK_ID(8, UNIT_SEC) }, |
542 | { "9s ", -1 }, | 543 | { "9s ", TALK_ID(9, UNIT_SEC) }, |
543 | { "10s", -1 }, | 544 | { "10s", TALK_ID(10, UNIT_SEC) }, |
544 | { "15s", -1 }, | 545 | { "15s", TALK_ID(15, UNIT_SEC) }, |
545 | { "20s", -1 }, | 546 | { "20s", TALK_ID(20, UNIT_SEC) }, |
546 | { "25s", -1 }, | 547 | { "25s", TALK_ID(25, UNIT_SEC) }, |
547 | { "30s", -1 }, | 548 | { "30s", TALK_ID(30, UNIT_SEC) }, |
548 | { "45s", -1 }, | 549 | { "45s", TALK_ID(45, UNIT_SEC) }, |
549 | { "60s", -1 }, | 550 | { "60s", TALK_ID(60, UNIT_SEC) }, |
550 | { "90s", -1 } | 551 | { "90s", TALK_ID(90, UNIT_SEC) } |
551 | }; | 552 | }; |
552 | return set_option(str(LANG_BACKLIGHT), &global_settings.backlight_timeout, | 553 | return set_option(str(LANG_BACKLIGHT), &global_settings.backlight_timeout, |
553 | INT, names, 19, backlight_set_timeout ); | 554 | INT, names, 19, backlight_set_timeout ); |
@@ -557,20 +558,20 @@ static bool poweroff_idle_timer(void) | |||
557 | { | 558 | { |
558 | struct opt_items names[] = { | 559 | struct opt_items names[] = { |
559 | { STR(LANG_OFF) }, | 560 | { STR(LANG_OFF) }, |
560 | { "1m ", -1 }, | 561 | { "1m ", TALK_ID(1, UNIT_MIN) }, |
561 | { "2m ", -1 }, | 562 | { "2m ", TALK_ID(2, UNIT_MIN) }, |
562 | { "3m ", -1 }, | 563 | { "3m ", TALK_ID(3, UNIT_MIN) }, |
563 | { "4m ", -1 }, | 564 | { "4m ", TALK_ID(4, UNIT_MIN) }, |
564 | { "5m ", -1 }, | 565 | { "5m ", TALK_ID(5, UNIT_MIN) }, |
565 | { "6m ", -1 }, | 566 | { "6m ", TALK_ID(6, UNIT_MIN) }, |
566 | { "7m ", -1 }, | 567 | { "7m ", TALK_ID(7, UNIT_MIN) }, |
567 | { "8m ", -1 }, | 568 | { "8m ", TALK_ID(8, UNIT_MIN) }, |
568 | { "9m ", -1 }, | 569 | { "9m ", TALK_ID(9, UNIT_MIN) }, |
569 | { "10m", -1 }, | 570 | { "10m", TALK_ID(10, UNIT_MIN) }, |
570 | { "15m", -1 }, | 571 | { "15m", TALK_ID(15, UNIT_MIN) }, |
571 | { "30m", -1 }, | 572 | { "30m", TALK_ID(30, UNIT_MIN) }, |
572 | { "45m", -1 }, | 573 | { "45m", TALK_ID(45, UNIT_MIN) }, |
573 | { "60m", -1 } | 574 | { "60m", TALK_ID(60, UNIT_MIN) } |
574 | }; | 575 | }; |
575 | return set_option(str(LANG_POWEROFF_IDLE), &global_settings.poweroff, | 576 | return set_option(str(LANG_POWEROFF_IDLE), &global_settings.poweroff, |
576 | INT, names, 15, set_poweroff_timeout); | 577 | INT, names, 15, set_poweroff_timeout); |
@@ -613,9 +614,9 @@ static bool jump_scroll(void) | |||
613 | struct opt_items names[] = { | 614 | struct opt_items names[] = { |
614 | { STR(LANG_OFF) }, | 615 | { STR(LANG_OFF) }, |
615 | { STR(LANG_ONE_TIME) }, | 616 | { STR(LANG_ONE_TIME) }, |
616 | { "2", -1 }, | 617 | { "2", TALK_ID(2, UNIT_INT) }, |
617 | { "3", -1 }, | 618 | { "3", TALK_ID(3, UNIT_INT) }, |
618 | { "4", -1 }, | 619 | { "4", TALK_ID(4, UNIT_INT) }, |
619 | { STR(LANG_ALWAYS) } | 620 | { STR(LANG_ALWAYS) } |
620 | }; | 621 | }; |
621 | bool ret; | 622 | bool ret; |
@@ -799,20 +800,20 @@ static bool buffer_margin(void) | |||
799 | static bool ff_rewind_min_step(void) | 800 | static bool ff_rewind_min_step(void) |
800 | { | 801 | { |
801 | struct opt_items names[] = { | 802 | struct opt_items names[] = { |
802 | { "1s", -1 }, | 803 | { "1s", TALK_ID(1, UNIT_SEC) }, |
803 | { "2s", -1 }, | 804 | { "2s", TALK_ID(2, UNIT_SEC) }, |
804 | { "3s", -1 }, | 805 | { "3s", TALK_ID(3, UNIT_SEC) }, |
805 | { "4s", -1 }, | 806 | { "4s", TALK_ID(4, UNIT_SEC) }, |
806 | { "5s", -1 }, | 807 | { "5s", TALK_ID(5, UNIT_SEC) }, |
807 | { "6s", -1 }, | 808 | { "6s", TALK_ID(6, UNIT_SEC) }, |
808 | { "8s", -1 }, | 809 | { "8s", TALK_ID(8, UNIT_SEC) }, |
809 | { "10s", -1 }, | 810 | { "10s", TALK_ID(10, UNIT_SEC) }, |
810 | { "15s", -1 }, | 811 | { "15s", TALK_ID(15, UNIT_SEC) }, |
811 | { "20s", -1 }, | 812 | { "20s", TALK_ID(20, UNIT_SEC) }, |
812 | { "25s", -1 }, | 813 | { "25s", TALK_ID(25, UNIT_SEC) }, |
813 | { "30s", -1 }, | 814 | { "30s", TALK_ID(30, UNIT_SEC) }, |
814 | { "45s", -1 }, | 815 | { "45s", TALK_ID(45, UNIT_SEC) }, |
815 | { "60s", -1 } | 816 | { "60s", TALK_ID(60, UNIT_SEC) } |
816 | }; | 817 | }; |
817 | return set_option(str(LANG_FFRW_STEP), &global_settings.ff_rewind_min_step, | 818 | return set_option(str(LANG_FFRW_STEP), &global_settings.ff_rewind_min_step, |
818 | INT, names, 14, NULL ); | 819 | INT, names, 14, NULL ); |
@@ -828,21 +829,21 @@ static bool ff_rewind_accel(void) | |||
828 | { | 829 | { |
829 | struct opt_items names[] = { | 830 | struct opt_items names[] = { |
830 | { STR(LANG_OFF) }, | 831 | { STR(LANG_OFF) }, |
831 | { "2x/1s", -1 }, | 832 | { "2x/1s", TALK_ID(1, UNIT_SEC) }, |
832 | { "2x/2s", -1 }, | 833 | { "2x/2s", TALK_ID(2, UNIT_SEC) }, |
833 | { "2x/3s", -1 }, | 834 | { "2x/3s", TALK_ID(3, UNIT_SEC) }, |
834 | { "2x/4s", -1 }, | 835 | { "2x/4s", TALK_ID(4, UNIT_SEC) }, |
835 | { "2x/5s", -1 }, | 836 | { "2x/5s", TALK_ID(5, UNIT_SEC) }, |
836 | { "2x/6s", -1 }, | 837 | { "2x/6s", TALK_ID(6, UNIT_SEC) }, |
837 | { "2x/7s", -1 }, | 838 | { "2x/7s", TALK_ID(7, UNIT_SEC) }, |
838 | { "2x/8s", -1 }, | 839 | { "2x/8s", TALK_ID(8, UNIT_SEC) }, |
839 | { "2x/9s", -1 }, | 840 | { "2x/9s", TALK_ID(9, UNIT_SEC) }, |
840 | { "2x/10s", -1 }, | 841 | { "2x/10s", TALK_ID(10, UNIT_SEC) }, |
841 | { "2x/11s", -1 }, | 842 | { "2x/11s", TALK_ID(11, UNIT_SEC) }, |
842 | { "2x/12s", -1 }, | 843 | { "2x/12s", TALK_ID(12, UNIT_SEC) }, |
843 | { "2x/13s", -1 }, | 844 | { "2x/13s", TALK_ID(13, UNIT_SEC) }, |
844 | { "2x/14s", -1 }, | 845 | { "2x/14s", TALK_ID(14, UNIT_SEC) }, |
845 | { "2x/15s", -1 } | 846 | { "2x/15s", TALK_ID(15, UNIT_SEC) } |
846 | }; | 847 | }; |
847 | return set_option(str(LANG_FFRW_ACCEL), &global_settings.ff_rewind_accel, | 848 | return set_option(str(LANG_FFRW_ACCEL), &global_settings.ff_rewind_accel, |
848 | INT, names, 16, NULL ); | 849 | INT, names, 16, NULL ); |