summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2023-06-15 18:43:00 +0200
committerChristian Soffke <christian.soffke@gmail.com>2023-06-15 18:56:20 +0200
commit2747e920baf4346bde62dc65dbdbfa3df39fe3cd (patch)
treec1afb9d2631264570e7ac3b6dc4255ecda54fa81
parentcfd5ef8db8c0cf702e3fb49ec67f5fea94c558fa (diff)
downloadrockbox-2747e920baf4346bde62dc65dbdbfa3df39fe3cd.tar.gz
rockbox-2747e920baf4346bde62dc65dbdbfa3df39fe3cd.zip
Track Info: Never return NULL in list item name callback
Just for good measure Change-Id: I9dc25b2fd687da2b1fddf31ce1c1ea8895e4399c
-rw-r--r--apps/screens.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/screens.c b/apps/screens.c
index 4c220e4751..50b7711fa7 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -729,11 +729,11 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
729} 729}
730 730
731/* gui_synclist callback */ 731/* gui_synclist callback */
732static const char* id3_get_info(int selected_item, void* data, 732static const char* id3_get_name_cb(int selected_item, void* data,
733 char *buffer, size_t buffer_len) 733 char *buffer, size_t buffer_len)
734{ 734{
735 return id3_get_or_speak_info(selected_item, data, buffer, 735 return id3_get_or_speak_info(selected_item, data, buffer,
736 buffer_len, false); 736 buffer_len, false) ? : "";
737} 737}
738 738
739static int id3_speak_item(int selected_item, void* data) 739static int id3_speak_item(int selected_item, void* data)
@@ -774,11 +774,11 @@ refresh_info:
774 { 774 {
775 char temp[8]; 775 char temp[8];
776 info.info_id[i] = i; 776 info.info_id[i] = i;
777 if (id3_get_info((i*2)+1, &info, temp, 8) != NULL) 777 if (id3_get_or_speak_info((i*2)+1, &info, temp, 8, false) != NULL)
778 info.info_id[info.count++] = i; 778 info.info_id[info.count++] = i;
779 } 779 }
780 780
781 gui_synclist_init(&id3_lists, &id3_get_info, &info, true, 2, NULL); 781 gui_synclist_init(&id3_lists, &id3_get_name_cb, &info, true, 2, NULL);
782 if(global_settings.talk_menu) 782 if(global_settings.talk_menu)
783 gui_synclist_set_voice_callback(&id3_lists, id3_speak_item); 783 gui_synclist_set_voice_callback(&id3_lists, id3_speak_item);
784 gui_synclist_set_nb_items(&id3_lists, info.count*2); 784 gui_synclist_set_nb_items(&id3_lists, info.count*2);