diff options
-rw-r--r-- | apps/gui/skin_engine/skin_engine.h | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_touchsupport.c | 5 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.c | 3 | ||||
-rw-r--r-- | apps/gui/wps.c | 3 | ||||
-rw-r--r-- | apps/radio/radio_skin.c | 3 |
5 files changed, 5 insertions, 13 deletions
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index a685f4f072..b56674112c 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h | |||
@@ -40,12 +40,10 @@ enum skinnable_screens { | |||
40 | 40 | ||
41 | struct skin_stats; | 41 | struct skin_stats; |
42 | struct skin_viewport; | 42 | struct skin_viewport; |
43 | struct touchregion; | ||
44 | struct wps_data; | 43 | struct wps_data; |
45 | 44 | ||
46 | #ifdef HAVE_TOUCHSCREEN | 45 | #ifdef HAVE_TOUCHSCREEN |
47 | int skin_get_touchaction(struct wps_data *data, int* edge_offset, | 46 | int skin_get_touchaction(struct wps_data *data, int* edge_offset); |
48 | struct touchregion **retregion); | ||
49 | void skin_disarm_touchregions(struct wps_data *data); | 47 | void skin_disarm_touchregions(struct wps_data *data); |
50 | #endif | 48 | #endif |
51 | 49 | ||
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c index 045bc809c8..eba6b82f5b 100644 --- a/apps/gui/skin_engine/skin_touchsupport.c +++ b/apps/gui/skin_engine/skin_touchsupport.c | |||
@@ -52,8 +52,7 @@ void skin_disarm_touchregions(struct wps_data *data) | |||
52 | * egde_offset is a percentage value for the position of the touch | 52 | * egde_offset is a percentage value for the position of the touch |
53 | * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type. | 53 | * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type. |
54 | */ | 54 | */ |
55 | int skin_get_touchaction(struct wps_data *data, int* edge_offset, | 55 | int skin_get_touchaction(struct wps_data *data, int* edge_offset) |
56 | struct touchregion **retregion) | ||
57 | { | 56 | { |
58 | int returncode = ACTION_NONE; | 57 | int returncode = ACTION_NONE; |
59 | short x,y; | 58 | short x,y; |
@@ -163,8 +162,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, | |||
163 | /* On release, all regions are disarmed. */ | 162 | /* On release, all regions are disarmed. */ |
164 | if (released) | 163 | if (released) |
165 | skin_disarm_touchregions(data); | 164 | skin_disarm_touchregions(data); |
166 | if (retregion && temp) | ||
167 | *retregion = temp; | ||
168 | if (temp && temp->press_length == LONG_PRESS) | 165 | if (temp && temp->press_length == LONG_PRESS) |
169 | temp->armed = false; | 166 | temp->armed = false; |
170 | 167 | ||
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index f1b8af015e..5d2b65846d 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -307,7 +307,6 @@ void sb_bypass_touchregions(bool enable) | |||
307 | 307 | ||
308 | int sb_touch_to_button(int context) | 308 | int sb_touch_to_button(int context) |
309 | { | 309 | { |
310 | struct touchregion *region; | ||
311 | static int last_context = -1; | 310 | static int last_context = -1; |
312 | int button, offset; | 311 | int button, offset; |
313 | if (bypass_sb_touchregions) | 312 | if (bypass_sb_touchregions) |
@@ -317,7 +316,7 @@ int sb_touch_to_button(int context) | |||
317 | skin_disarm_touchregions(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data); | 316 | skin_disarm_touchregions(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data); |
318 | last_context = context; | 317 | last_context = context; |
319 | button = skin_get_touchaction(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data, | 318 | button = skin_get_touchaction(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data, |
320 | &offset, ®ion); | 319 | &offset); |
321 | 320 | ||
322 | switch (button) | 321 | switch (button) |
323 | { | 322 | { |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 5b973a2199..9d7a4c96f3 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -159,9 +159,8 @@ static bool update_onvol_change(enum screen_type screen) | |||
159 | static int skintouch_to_wps(struct wps_data *data) | 159 | static int skintouch_to_wps(struct wps_data *data) |
160 | { | 160 | { |
161 | int offset = 0; | 161 | int offset = 0; |
162 | struct touchregion *region; | ||
163 | struct wps_state *gstate = get_wps_state(); | 162 | struct wps_state *gstate = get_wps_state(); |
164 | int button = skin_get_touchaction(data, &offset, ®ion); | 163 | int button = skin_get_touchaction(data, &offset); |
165 | switch (button) | 164 | switch (button) |
166 | { | 165 | { |
167 | case ACTION_STD_PREV: | 166 | case ACTION_STD_PREV: |
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c index 388da2694c..0b8781ecd6 100644 --- a/apps/radio/radio_skin.c +++ b/apps/radio/radio_skin.c | |||
@@ -96,11 +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 touchregion *region; | ||
100 | int offset; | 99 | int offset; |
101 | if (button == ACTION_TOUCHSCREEN) | 100 | if (button == ACTION_TOUCHSCREEN) |
102 | button = skin_get_touchaction(skin_get_gwps(FM_SCREEN, SCREEN_MAIN)->data, | 101 | button = skin_get_touchaction(skin_get_gwps(FM_SCREEN, SCREEN_MAIN)->data, |
103 | &offset, ®ion); | 102 | &offset); |
104 | switch (button) | 103 | switch (button) |
105 | { | 104 | { |
106 | case ACTION_WPS_STOP: | 105 | case ACTION_WPS_STOP: |