diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-04 23:22:21 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-11-15 14:20:31 +0000 |
commit | 73b1e30bb04d87144c4106ff7a9457507d191491 (patch) | |
tree | 377a307a2ba7f3065fa60cf316c20c01d03a2725 /apps/gui/statusbar-skinned.c | |
parent | 45bd4c7220280e3eafdd2722cc17c8db8617b676 (diff) | |
download | rockbox-73b1e30bb04d87144c4106ff7a9457507d191491.tar.gz rockbox-73b1e30bb04d87144c4106ff7a9457507d191491.zip |
skin engine: Reduce scope of internal wps_data struct
A bunch of public API calls take a wps_data struct argument,
but that's an internal type that doesn't have a direct getter.
Instead the skin engine provides a gui_wps struct as a way
to refer to a particular skin instance. Use that instead of
wps_data in the public API.
Change-Id: I13e1aa8df7f08ccfb789bb728d493ac8d7de1a9b
Diffstat (limited to 'apps/gui/statusbar-skinned.c')
-rw-r--r-- | apps/gui/statusbar-skinned.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index d6dddf5cd2..8dd66641dd 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -310,13 +310,13 @@ int sb_touch_to_button(int context) | |||
310 | int button, offset; | 310 | int button, offset; |
311 | if (bypass_sb_touchregions) | 311 | if (bypass_sb_touchregions) |
312 | return ACTION_TOUCHSCREEN; | 312 | return ACTION_TOUCHSCREEN; |
313 | 313 | ||
314 | struct gui_wps *gwps = skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN); | ||
314 | if (last_context != context) | 315 | if (last_context != context) |
315 | skin_disarm_touchregions(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data); | 316 | skin_disarm_touchregions(gwps); |
316 | last_context = context; | 317 | last_context = context; |
317 | button = skin_get_touchaction(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data, | 318 | |
318 | &offset); | 319 | button = skin_get_touchaction(gwps, &offset); |
319 | |||
320 | switch (button) | 320 | switch (button) |
321 | { | 321 | { |
322 | #ifdef HAVE_VOLUME_IN_LIST | 322 | #ifdef HAVE_VOLUME_IN_LIST |