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/statusbar-skinned.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/statusbar-skinned.c')
-rw-r--r-- | apps/gui/statusbar-skinned.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index 29e8d1a92a..887b0844d7 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -295,26 +295,6 @@ int sb_touch_to_button(int context) | |||
295 | case ACTION_WPS_VOLDOWN: | 295 | case ACTION_WPS_VOLDOWN: |
296 | return ACTION_LIST_VOLDOWN; | 296 | return ACTION_LIST_VOLDOWN; |
297 | #endif | 297 | #endif |
298 | case ACTION_SETTINGS_INC: | ||
299 | case ACTION_SETTINGS_DEC: | ||
300 | { | ||
301 | const struct settings_list *setting = region->data; | ||
302 | option_select_next_val(setting, button == ACTION_SETTINGS_DEC, true); | ||
303 | } | ||
304 | return ACTION_REDRAW; | ||
305 | case ACTION_TOUCH_MUTE: | ||
306 | { | ||
307 | const int min_vol = sound_min(SOUND_VOLUME); | ||
308 | if (global_settings.volume == min_vol) | ||
309 | global_settings.volume = region->value; | ||
310 | else | ||
311 | { | ||
312 | region->value = global_settings.volume; | ||
313 | global_settings.volume = min_vol; | ||
314 | } | ||
315 | setvol(); | ||
316 | } | ||
317 | return ACTION_REDRAW; | ||
318 | /* TODO */ | 298 | /* TODO */ |
319 | } | 299 | } |
320 | return button; | 300 | return button; |