Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

skin engine: Remove viewport_colour viewport field

Yet again, no need to store the viewport because we already know
it -- and this time the render code is obviously relying on that
assumption.

Change-Id: Id5eb7cd9999fbe1efccd54bd8f0fd3c8a3011c8e

+2 -8
-1
apps/gui/skin_engine/skin_parser.c
··· 747 747 &colour->colour)) 748 748 return -1; 749 749 } 750 - colour->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); 751 750 token->value.data = PTRTOSKINOFFSET(skin_buffer, colour); 752 751 if (element->line == curr_viewport_element->line) 753 752 {
+2 -6
apps/gui/skin_engine/skin_render.c
··· 110 110 { 111 111 struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); 112 112 if (!col) return false; 113 - struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); 114 - if (!vp) return false; 115 - vp->fg_pattern = col->colour; 113 + skin_vp->vp.fg_pattern = col->colour; 116 114 skin_vp->fgbg_changed = true; 117 115 } 118 116 break; ··· 120 118 { 121 119 struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); 122 120 if (!col) return false; 123 - struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); 124 - if (!vp) return false; 125 - vp->bg_pattern = col->colour; 121 + skin_vp->vp.bg_pattern = col->colour; 126 122 skin_vp->fgbg_changed = true; 127 123 } 128 124 break;
-1
apps/gui/skin_engine/wps_internals.h
··· 196 196 #endif 197 197 }; 198 198 struct viewport_colour { 199 - OFFSETTYPE(struct viewport *) vp; 200 199 unsigned colour; 201 200 }; 202 201