diff options
Diffstat (limited to 'apps/radio/radio_skin.c')
-rw-r--r-- | apps/radio/radio_skin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c index 0b8781ecd6..dc38faa31a 100644 --- a/apps/radio/radio_skin.c +++ b/apps/radio/radio_skin.c | |||
@@ -63,12 +63,12 @@ void fms_fix_displays(enum fms_exiting toggle_state) | |||
63 | { | 63 | { |
64 | FOR_NB_SCREENS(i) | 64 | FOR_NB_SCREENS(i) |
65 | { | 65 | { |
66 | struct wps_data *data = skin_get_gwps(FM_SCREEN, i)->data; | 66 | struct gui_wps *gwps = skin_get_gwps(FM_SCREEN, i); |
67 | if (toggle_state == FMS_ENTER) | 67 | if (toggle_state == FMS_ENTER) |
68 | { | 68 | { |
69 | viewportmanager_theme_enable(i, skin_has_sbs(i, data), NULL); | 69 | viewportmanager_theme_enable(i, skin_has_sbs(gwps), NULL); |
70 | #ifdef HAVE_BACKDROP_IMAGE | 70 | #ifdef HAVE_BACKDROP_IMAGE |
71 | skin_backdrop_show(data->backdrop_id); | 71 | skin_backdrop_show(gwps->data->backdrop_id); |
72 | #endif | 72 | #endif |
73 | screens[i].clear_display(); | 73 | screens[i].clear_display(); |
74 | /* force statusbar/skin update since we just cleared the whole screen */ | 74 | /* force statusbar/skin update since we just cleared the whole screen */ |
@@ -80,10 +80,10 @@ void fms_fix_displays(enum fms_exiting toggle_state) | |||
80 | #ifdef HAVE_BACKDROP_IMAGE | 80 | #ifdef HAVE_BACKDROP_IMAGE |
81 | skin_backdrop_show(sb_get_backdrop(i)); | 81 | skin_backdrop_show(sb_get_backdrop(i)); |
82 | #endif | 82 | #endif |
83 | viewportmanager_theme_undo(i, skin_has_sbs(i, data)); | 83 | viewportmanager_theme_undo(i, skin_has_sbs(gwps)); |
84 | } | 84 | } |
85 | #ifdef HAVE_TOUCHSCREEN | 85 | #ifdef HAVE_TOUCHSCREEN |
86 | if (i==SCREEN_MAIN && !data->touchregions) | 86 | if (i==SCREEN_MAIN && !gwps->data->touchregions) |
87 | touchscreen_set_mode(toggle_state == FMS_ENTER ? | 87 | touchscreen_set_mode(toggle_state == FMS_ENTER ? |
88 | TOUCHSCREEN_BUTTON : global_settings.touch_mode); | 88 | TOUCHSCREEN_BUTTON : global_settings.touch_mode); |
89 | #endif | 89 | #endif |
@@ -96,10 +96,10 @@ int fms_do_button_loop(bool update_screen) | |||
96 | int button = skin_wait_for_action(FM_SCREEN, CONTEXT_FM|ALLOW_SOFTLOCK, | 96 | int button = skin_wait_for_action(FM_SCREEN, CONTEXT_FM|ALLOW_SOFTLOCK, |
97 | update_screen ? TIMEOUT_NOBLOCK : HZ/5); | 97 | update_screen ? TIMEOUT_NOBLOCK : HZ/5); |
98 | #ifdef HAVE_TOUCHSCREEN | 98 | #ifdef HAVE_TOUCHSCREEN |
99 | struct gui_wps *gwps = skin_get_gwps(FM_SCREEN, SCREEN_MAIN); | ||
99 | int offset; | 100 | int offset; |
100 | if (button == ACTION_TOUCHSCREEN) | 101 | if (button == ACTION_TOUCHSCREEN) |
101 | button = skin_get_touchaction(skin_get_gwps(FM_SCREEN, SCREEN_MAIN)->data, | 102 | button = skin_get_touchaction(gwps, &offset); |
102 | &offset); | ||
103 | switch (button) | 103 | switch (button) |
104 | { | 104 | { |
105 | case ACTION_WPS_STOP: | 105 | case ACTION_WPS_STOP: |