devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

voice: Correct all uses of spashf() with an ID2P() argument

Browse source 
...Instead voice the string and all of the arguments manually.

Change-Id: Ic030b2f00c90cb372ff5b781a8de4bcb19375d5d
This commit is contained in:
Solomon Peachy 2024-05-19 21:04:34 -04:00
parent dfe409c993
commit 62da4ad84b
3 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/playlist_catalog.c
View file

@ -95,7 +95,12 @@ static int initialize_catalog_buf(char* dirbuf, size_t dirbuf_sz)
if (!dir_exists(dirbuf)) if (!dir_exists(dirbuf))
{ {
if (mkdir(dirbuf) < 0) { if (mkdir(dirbuf) < 0) {
splashf(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY), dirbuf); if (global_settings.talk_menu) {
talk_id(LANG_CATALOG_NO_DIRECTORY, true);
talk_dir_or_spell(dirbuf, NULL, true);
talk_force_enqueue_next();
}
splashf(HZ*2, str(LANG_CATALOG_NO_DIRECTORY), dirbuf);
return -1; return -1;
} }
else { else {

8
apps/plugins/vbrfix.c
View file

@ -124,7 +124,13 @@ static int insert_data_in_file(const char *fname, int fpos, char *buf, int num_b
static void fileerror(int rc) static void fileerror(int rc)
{ {
rb->splashf(HZ*2, ID2P(LANG_FILE_ERROR), rc); if (rb->global_settings->talk_menu) {
rb->talk_id(LANG_FILE_ERROR, true);
rb->talk_value_decimal(rc, UNIT_INT, 0, true);
rb->talk_force_enqueue_next();
}
rb->splashf(HZ*2, rb->str(LANG_FILE_ERROR), rc);
} }
static const unsigned char empty_id3_header[] = static const unsigned char empty_id3_header[] =

8
apps/tagtree.c
View file

@ -41,6 +41,7 @@
#include "tagtree.h" #include "tagtree.h"
#include "lang.h" #include "lang.h"
#include "logf.h" #include "logf.h"
#include "talk.h"
#include "playlist.h" #include "playlist.h"
#include "keyboard.h" #include "keyboard.h"
#include "gui/list.h" #include "gui/list.h"
@ -1744,7 +1745,12 @@ entry_skip_formatter:
if (!sort && (sort_inverse || sort_limit)) if (!sort && (sort_inverse || sort_limit))
{ {
splashf(HZ*4, ID2P(LANG_SHOWDIR_BUFFER_FULL), total_count); if (global_settings.talk_menu) {
talk_id(LANG_SHOWDIR_BUFFER_FULL, true);
talk_value(total_count, UNIT_INT, true);
}
splashf(HZ*4, str(LANG_SHOWDIR_BUFFER_FULL), total_count);
logf("Too small dir buffer"); logf("Too small dir buffer");
return 0; return 0;
} }