diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-03-01 07:26:11 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-03-01 07:26:11 +0000 |
commit | fb3616368f5e9994716e30a040865f3cf398aa21 (patch) | |
tree | a5b6f171e058539394ecab91c45211341d21165b /apps/gui/wps.c | |
parent | 55fab772b7399737e9c22737f91cd3e74c793872 (diff) | |
download | rockbox-fb3616368f5e9994716e30a040865f3cf398aa21.tar.gz rockbox-fb3616368f5e9994716e30a040865f3cf398aa21.zip |
Remove code duplication in some generic skin touch action handling.
fix a bug which stopped the setting_inc/dec touch actions from parsing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29477 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps.c')
-rw-r--r-- | apps/gui/wps.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 48498fefd4..44e4adb372 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -239,26 +239,6 @@ static int skintouch_to_wps(struct wps_data *data) | |||
239 | setvol(); | 239 | setvol(); |
240 | } | 240 | } |
241 | return ACTION_TOUCHSCREEN; | 241 | return ACTION_TOUCHSCREEN; |
242 | case ACTION_SETTINGS_INC: | ||
243 | case ACTION_SETTINGS_DEC: | ||
244 | { | ||
245 | const struct settings_list *setting = region->data; | ||
246 | option_select_next_val(setting, button == ACTION_SETTINGS_DEC, true); | ||
247 | } | ||
248 | return ACTION_REDRAW; | ||
249 | case ACTION_TOUCH_MUTE: | ||
250 | { | ||
251 | const int min_vol = sound_min(SOUND_VOLUME); | ||
252 | if (global_settings.volume == min_vol) | ||
253 | global_settings.volume = region->value; | ||
254 | else | ||
255 | { | ||
256 | region->value = global_settings.volume; | ||
257 | global_settings.volume = min_vol; | ||
258 | } | ||
259 | setvol(); | ||
260 | } | ||
261 | return ACTION_REDRAW; | ||
262 | } | 242 | } |
263 | return button; | 243 | return button; |
264 | } | 244 | } |