diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-08-04 22:42:46 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-08-05 05:01:29 +0200 |
commit | 8143e4437bdcb1c2b25013cc285834b224d8d93c (patch) | |
tree | 1ada1f35996b144314c03478c8fb0a6d19026e7b /apps/gui | |
parent | 3b7ae5e06b39deb083b1a0f2e5452841fe59acbb (diff) | |
download | rockbox-8143e4437bdcb1c2b25013cc285834b224d8d93c.tar.gz rockbox-8143e4437bdcb1c2b25013cc285834b224d8d93c.zip |
Speech Feedback improvements on the Quickscreen
Patch by Igor Poretsky
Change-Id: I1bb94965cb18efaa0787d7780f6cf22814231144
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/option_select.c | 2 | ||||
-rw-r--r-- | apps/gui/quickscreen.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 9cdd79cce6..ec8b474191 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -188,7 +188,7 @@ void option_talk_value(const struct settings_list *setting, int value, bool enqu | |||
188 | talkunit = UNIT_PERCENT; | 188 | talkunit = UNIT_PERCENT; |
189 | else if (!strcmp(unit, "Hz")) | 189 | else if (!strcmp(unit, "Hz")) |
190 | talkunit = UNIT_HERTZ; | 190 | talkunit = UNIT_HERTZ; |
191 | talk_value_decimal(phys, talkunit, decimals, false); | 191 | talk_value_decimal(phys, talkunit, decimals, enqueue); |
192 | } | 192 | } |
193 | else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING) | 193 | else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING) |
194 | { | 194 | { |
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 406d969b37..87eb134c78 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -233,10 +233,9 @@ static void talk_qs_option(const struct settings_list *opt, bool enqueue) | |||
233 | if (!global_settings.talk_menu || !opt) | 233 | if (!global_settings.talk_menu || !opt) |
234 | return; | 234 | return; |
235 | 235 | ||
236 | if (!enqueue) | 236 | if (enqueue) |
237 | talk_shutup(); | 237 | talk_id(opt->lang_id, enqueue); |
238 | talk_id(opt->lang_id, true); | 238 | option_talk_value(opt, option_value_as_int(opt), enqueue); |
239 | option_talk_value(opt, option_value_as_int(opt), true); | ||
240 | } | 239 | } |
241 | 240 | ||
242 | /* | 241 | /* |
@@ -334,9 +333,11 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
334 | changed. */ | 333 | changed. */ |
335 | cond_talk_ids(VOICE_QUICKSCREEN); | 334 | cond_talk_ids(VOICE_QUICKSCREEN); |
336 | talk_qs_option(qs->items[QUICKSCREEN_TOP], true); | 335 | talk_qs_option(qs->items[QUICKSCREEN_TOP], true); |
336 | if (qs->items[QUICKSCREEN_TOP] != qs->items[QUICKSCREEN_BOTTOM]) | ||
337 | talk_qs_option(qs->items[QUICKSCREEN_BOTTOM], true); | ||
337 | talk_qs_option(qs->items[QUICKSCREEN_LEFT], true); | 338 | talk_qs_option(qs->items[QUICKSCREEN_LEFT], true); |
338 | talk_qs_option(qs->items[QUICKSCREEN_BOTTOM], true); | 339 | if (qs->items[QUICKSCREEN_LEFT] != qs->items[QUICKSCREEN_RIGHT]) |
339 | talk_qs_option(qs->items[QUICKSCREEN_RIGHT], true); | 340 | talk_qs_option(qs->items[QUICKSCREEN_RIGHT], true); |
340 | while (true) { | 341 | while (true) { |
341 | button = get_action(CONTEXT_QUICKSCREEN, HZ/5); | 342 | button = get_action(CONTEXT_QUICKSCREEN, HZ/5); |
342 | #ifdef HAVE_TOUCHSCREEN | 343 | #ifdef HAVE_TOUCHSCREEN |