Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Track Info: Never return NULL in list item name callback

Browse source 
Just for good measure

Change-Id: I9dc25b2fd687da2b1fddf31ce1c1ea8895e4399c
This commit is contained in:
Christian Soffke 2023-06-15 18:43:00 +02:00
parent cfd5ef8db8
commit 2747e920ba
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/screens.c
View file

@ -729,11 +729,11 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
} }
/* gui_synclist callback */ /* gui_synclist callback */
static const char* id3_get_info(int selected_item, void* data, static const char* id3_get_name_cb(int selected_item, void* data,
char *buffer, size_t buffer_len) char *buffer, size_t buffer_len)
{ {
return id3_get_or_speak_info(selected_item, data, buffer, return id3_get_or_speak_info(selected_item, data, buffer,
buffer_len, false); buffer_len, false) ? : "";
} }
static int id3_speak_item(int selected_item, void* data) static int id3_speak_item(int selected_item, void* data)
@ -774,11 +774,11 @@ refresh_info:
{ {
char temp[8]; char temp[8];
info.info_id[i] = i; info.info_id[i] = i;
if (id3_get_info((i*2)+1, &info, temp, 8) != NULL) if (id3_get_or_speak_info((i*2)+1, &info, temp, 8, false) != NULL)
info.info_id[info.count++] = i; info.info_id[info.count++] = i;
} }
gui_synclist_init(&id3_lists, &id3_get_info, &info, true, 2, NULL); gui_synclist_init(&id3_lists, &id3_get_name_cb, &info, true, 2, NULL);
if(global_settings.talk_menu) if(global_settings.talk_menu)
gui_synclist_set_voice_callback(&id3_lists, id3_speak_item); gui_synclist_set_voice_callback(&id3_lists, id3_speak_item);
gui_synclist_set_nb_items(&id3_lists, info.count*2); gui_synclist_set_nb_items(&id3_lists, info.count*2);