diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-01-13 10:56:23 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-01-13 10:56:23 +0000 |
commit | 605e2d0e90b335897cc1e29c575a27dabc778491 (patch) | |
tree | 55cb67f5e7abc0fe1f5d62090ffda4abb4948959 /apps/gui/wps.c | |
parent | ded64f1db58e15bb310da2c685afed6b3dbce4b5 (diff) | |
download | rockbox-605e2d0e90b335897cc1e29c575a27dabc778491.tar.gz rockbox-605e2d0e90b335897cc1e29c575a27dabc778491.zip |
New Touchscreen region type... 'mute' which un/mutes volume without pausing playback
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29046 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps.c')
-rw-r--r-- | apps/gui/wps.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 7d633ad4e8..e528380576 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -242,10 +242,23 @@ static int skintouch_to_wps(struct wps_data *data) | |||
242 | case ACTION_SETTINGS_INC: | 242 | case ACTION_SETTINGS_INC: |
243 | case ACTION_SETTINGS_DEC: | 243 | case ACTION_SETTINGS_DEC: |
244 | { | 244 | { |
245 | const struct settings_list *setting = region->extradata; | 245 | const struct settings_list *setting = region->data; |
246 | option_select_next_val(setting, button == ACTION_SETTINGS_DEC, true); | 246 | option_select_next_val(setting, button == ACTION_SETTINGS_DEC, true); |
247 | } | 247 | } |
248 | return ACTION_REDRAW; | 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; | ||
249 | } | 262 | } |
250 | return button; | 263 | return button; |
251 | } | 264 | } |