len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

playlist_viewer reduce bss usage

Browse source 
the extra title pointer and alignment adds around 1k to the bss area
since we already have a pointer to track->name we can just save an offset
for the title data

Change-Id: I3a19857631d70276134bcc97940824a3e2f80e4a
This commit is contained in:
William Wilgus 2024-07-12 10:47:15 -04:00 • committed by William Wilgus
parent 8801ed0824
commit da8d6152ad
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/playlist_viewer.c
View file

@ -65,10 +65,10 @@
/* Information about a specific track */ /* Information about a specific track */
struct playlist_entry { struct playlist_entry {
char *name; /* track path */ char *name; /* track path */
char *title; /* Formatted track name */ int index; /* Playlist index */
int index; /* Playlist index */ int display_index; /* Display index */
int display_index; /* Display index */ uint16_t title_offset; /* where in the buffer the title is located */
int attr; /* Is track queued?; Is track marked as bad?*/ uint16_t attr; /* Is track queued?; Is track marked as bad?*/
}; };
enum direction enum direction
@ -125,8 +125,6 @@ struct playlist_viewer {
struct playlist_buffer buffer; struct playlist_buffer buffer;
}; };
static struct playlist_viewer viewer; static struct playlist_viewer viewer;
/* Used when viewing playlists on disk */ /* Used when viewing playlists on disk */
@ -280,7 +278,7 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
if (len <= remaining_size) if (len <= remaining_size)
{ {
entry->name = name_buffer; entry->name = name_buffer;
entry->title = name_buffer; entry->title_offset = 0; /* offset 0 is the first char of name */
entry->index = info.index; entry->index = info.index;
entry->display_index = info.display_index; entry->display_index = info.display_index;
entry->attr = info.attr & (PLAYLIST_ATTR_SKIPPED | PLAYLIST_ATTR_QUEUED); entry->attr = info.attr & (PLAYLIST_ATTR_SKIPPED | PLAYLIST_ATTR_QUEUED);
@ -295,7 +293,8 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
return -1; /*Failure */ return -1; /*Failure */
if (tlen > 0) if (tlen > 0)
{ {
entry->title = name_buffer; entry->title_offset = len;
/* offset is the first char after terminating zero of name */
len += tlen; len += tlen;
} }
} }
@ -528,7 +527,7 @@ static void format_line(const struct playlist_entry* track, char* str,
{ {
char name[MAX_PATH]; char name[MAX_PATH];
char *skipped = ""; char *skipped = "";
format_name(name, track->title, sizeof(name)); format_name(name, track->name + track->title_offset, sizeof(name));
if (track->attr & PLAYLIST_ATTR_SKIPPED) if (track->attr & PLAYLIST_ATTR_SKIPPED)
skipped = "(ERR) "; skipped = "(ERR) ";
@ -859,7 +858,7 @@ static int playlist_callback_voice(int selected_item, void *data)
talk_fullpath(track->name, true); talk_fullpath(track->name, true);
break; break;
case 2: /*title*/ case 2: /*title*/
talk_spell(track->title, true); talk_spell(track->name + track->title_offset, true);
break; break;
default: default:
case 0: /*filename only*/ case 0: /*filename only*/
@ -1209,25 +1208,28 @@ static void close_playlist_viewer(void)
} }
} }
static struct playlist_track_info* get_static_track_info(int *found_indicies, int selected_item)
{
/* playlist_track_info is a large struct keep a static copy to hand out */
static struct playlist_track_info track;
playlist_get_track_info(viewer.playlist, found_indicies[selected_item], &track);
return &track;
}
static const char* playlist_search_callback_name(int selected_item, void * data, static const char* playlist_search_callback_name(int selected_item, void * data,
char *buffer, size_t buffer_len) char *buffer, size_t buffer_len)
{ {
int *found_indicies = (int*)data; struct playlist_track_info *track = get_static_track_info(data, selected_item);
static struct playlist_track_info track; format_name(buffer, track->filename, buffer_len);
playlist_get_track_info(viewer.playlist, found_indicies[selected_item], &track);
format_name(buffer, track.filename, buffer_len);
return buffer; return buffer;
} }
static int say_search_item(int selected_item, void *data) static int say_search_item(int selected_item, void *data)
{ {
int *found_indicies = (int*)data; struct playlist_track_info *track = get_static_track_info(data, selected_item);
static struct playlist_track_info track;
playlist_get_track_info(viewer.playlist,found_indicies[selected_item],&track);
if(global_settings.playlist_viewer_track_display == 1) if(global_settings.playlist_viewer_track_display == 1)
talk_fullpath(track.filename, false); talk_fullpath(track->filename, false);
else talk_file_or_spell(NULL, track.filename, NULL, false); else talk_file_or_spell(NULL, track->filename, NULL, false);
return 0; return 0;
} }