summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-10-15 23:55:39 +0100
committerAidan MacDonald <amachronic@protonmail.com>2023-01-13 10:32:54 +0000
commit1e9ad3ca0d9bf3e917eb2beb460421155144760a (patch)
tree752590b42f338f03223e024fc5b642ac9a8a5598 /apps/gui/skin_engine
parent3301c5aa6db76832dbb9af8f72d29b348190fd91 (diff)
downloadrockbox-1e9ad3ca0d9bf3e917eb2beb460421155144760a.tar.gz
rockbox-1e9ad3ca0d9bf3e917eb2beb460421155144760a.zip
Remove buflib allocation names, part two
Remove allocation names from the buflib API and fix up all callers. Change-Id: I3df922e258d5f0d711d70e72b56b4ed634fb0f5a
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r--apps/gui/skin_engine/skin_backdrops.c5
-rw-r--r--apps/gui/skin_engine/skin_parser.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index 8be40d1ce2..eecf5b0433 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -174,7 +174,7 @@ bool skin_backdrops_preload(void)
174 } 174 }
175 if (*filename && *filename != '-') 175 if (*filename && *filename != '-')
176 { 176 {
177 backdrops[i].buflib_handle = core_alloc_ex(filename, buf_size, &buflib_ops); 177 backdrops[i].buflib_handle = core_alloc_ex(buf_size, &buflib_ops);
178 if (backdrops[i].buflib_handle > 0) 178 if (backdrops[i].buflib_handle > 0)
179 { 179 {
180 backdrops[i].buffer = core_get_data(backdrops[i].buflib_handle); 180 backdrops[i].buffer = core_get_data(backdrops[i].buflib_handle);
@@ -287,8 +287,7 @@ void skin_backdrop_load_setting(void)
287 if (backdrops[i].buflib_handle <= 0) 287 if (backdrops[i].buflib_handle <= 0)
288 { 288 {
289 backdrops[i].buflib_handle = 289 backdrops[i].buflib_handle =
290 core_alloc_ex(global_settings.backdrop_file, 290 core_alloc_ex(LCD_BACKDROP_BYTES, &buflib_ops);
291 LCD_BACKDROP_BYTES, &buflib_ops);
292 if (backdrops[i].buflib_handle <= 0) 291 if (backdrops[i].buflib_handle <= 0)
293 return; 292 return;
294 } 293 }
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index d99394eed0..6cc3c596b0 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -2574,8 +2574,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
2574 } 2574 }
2575#endif 2575#endif
2576#ifndef __PCTOOL__ 2576#ifndef __PCTOOL__
2577 wps_data->buflib_handle = core_alloc(isfile ? buf : "failsafe skin", 2577 wps_data->buflib_handle = core_alloc(skin_buffer_usage());
2578 skin_buffer_usage());
2579 if (wps_data->buflib_handle > 0) 2578 if (wps_data->buflib_handle > 0)
2580 { 2579 {
2581 wps_data->wps_loaded = true; 2580 wps_data->wps_loaded = true;