len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

voice: fix regression 39f8685 (already voiced)

Browse source 
Some of the splashf messages that were converted
to support voicing in commit 39f8685 already had
a voice equivalent that was more appropriate,
since it also voiced parameters, and included
pauses between announcements where necessary.

Change-Id: Ia91a01c82acd6148afb4afadd64b1105802aea36
This commit is contained in:
Christian Soffke 2025-05-26 01:45:50 +02:00
parent 348054712d
commit 498d581ca6
7 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/alarm_menu.c
View file

@ -74,7 +74,8 @@ int alarm_screen(void)
talk_value(mins_togo % 60, UNIT_MIN, true); talk_value(mins_togo % 60, UNIT_MIN, true);
talk_force_enqueue_next(); talk_force_enqueue_next();
} }
splashf(HZ*2, ID2P(LANG_ALARM_MOD_TIME_TO_GO), /* (voiced above) */
splashf(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO),
mins_togo / 60, mins_togo % 60); mins_togo / 60, mins_togo % 60);
} else { } else {
splash(HZ, ID2P(LANG_ALARM_MOD_ERROR)); splash(HZ, ID2P(LANG_ALARM_MOD_ERROR));

2
apps/playlist.c
View file

@ -684,7 +684,7 @@ static void display_playlist_count(int count, const unsigned char *fmt,
} }
} }
splashf(0, fmt, count, str(LANG_OFF_ABORT)); splashf(0, P2STR(fmt), count, str(LANG_OFF_ABORT)); /* (voiced above) */
} }
/* /*

4
apps/playlist_catalog.c
View file

@ -264,8 +264,8 @@ static void display_insert_count(int count)
talk_number(count, false); talk_number(count, false);
talk_id(LANG_PLAYLIST_INSERT_COUNT, true); talk_id(LANG_PLAYLIST_INSERT_COUNT, true);
} }
/* (voiced above) */
splashf(0, ID2P(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT)); splashf(0, str(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT));
} }
/* Add specified track into playlist. Callback from directory insert */ /* Add specified track into playlist. Callback from directory insert */

3
apps/plugins/mikmod/mikmod.c
View file

@ -711,7 +711,8 @@ static void mm_errorhandler(void)
rb->talk_value_decimal(MikMod_errno, UNIT_INT, 0, true); rb->talk_value_decimal(MikMod_errno, UNIT_INT, 0, true);
rb->talk_force_enqueue_next(); rb->talk_force_enqueue_next();
} }
rb->splashf(HZ, ID2P(LANG_ERROR_FORMATSTR), MikMod_strerror(MikMod_errno)); /* (voiced above) */
rb->splashf(HZ, rb->str(LANG_ERROR_FORMATSTR), MikMod_strerror(MikMod_errno));
quit = true; quit = true;
} }

2
apps/plugins/vbrfix.c
View file

@ -130,7 +130,7 @@ static void fileerror(int rc)
rb->talk_force_enqueue_next(); rb->talk_force_enqueue_next();
} }
rb->splashf(HZ*2, ID2P(LANG_FILE_ERROR), rc); rb->splashf(HZ*2, rb->str(LANG_FILE_ERROR), rc); /* (voiced above) */
} }
static const unsigned char empty_id3_header[] = static const unsigned char empty_id3_header[] =

4
apps/root_menu.c
View file

@ -257,8 +257,8 @@ static int browser(void* param)
} }
else else
{ {
splashf(0, ID2P(LANG_BUILDING_DATABASE), splashf(0, str(LANG_BUILDING_DATABASE),
stat->processed_entries); stat->processed_entries); /* (voiced above) */
} }
} }
} }

4
apps/tagtree.c
View file

@ -2404,8 +2404,8 @@ static bool insert_all_playlist(struct tree_context *c,
n, slots_remaining); n, slots_remaining);
talk_id(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY, true); talk_id(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY, true);
splashf(HZ * 2, ID2P(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY), splashf(HZ * 2, str(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY),
slots_remaining); slots_remaining); /* voiced above */
} }
} }