diff options
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/apps/wps.c b/apps/wps.c index d919261461..270f3ae1de 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -127,6 +127,9 @@ int wps_show(void) | |||
127 | unsigned int lastlength=0, lastsize=0, lastrate=0; | 127 | unsigned int lastlength=0, lastsize=0, lastrate=0; |
128 | int lastartist=0, lastalbum=0, lasttitle=0; | 128 | int lastartist=0, lastalbum=0, lasttitle=0; |
129 | bool lastvbr = false; | 129 | bool lastvbr = false; |
130 | #ifdef HAVE_PLAYER_KEYPAD | ||
131 | bool dont_quit = true; | ||
132 | #endif | ||
130 | 133 | ||
131 | lcd_clear_display(); | 134 | lcd_clear_display(); |
132 | 135 | ||
@@ -192,7 +195,13 @@ int wps_show(void) | |||
192 | for ( i=0;i<5;i++ ) { | 195 | for ( i=0;i<5;i++ ) { |
193 | switch ( button_get(false) ) { | 196 | switch ( button_get(false) ) { |
194 | case BUTTON_ON: | 197 | case BUTTON_ON: |
198 | #ifdef HAVE_PLAYER_KEYPAD | ||
199 | /* We don't want to quit just yet. Let's wait until | ||
200 | the key is released. */ | ||
201 | break; | ||
202 | #else | ||
195 | return 0; | 203 | return 0; |
204 | #endif | ||
196 | 205 | ||
197 | #ifdef HAVE_RECORDER_KEYPAD | 206 | #ifdef HAVE_RECORDER_KEYPAD |
198 | case BUTTON_PLAY: | 207 | case BUTTON_PLAY: |
@@ -248,6 +257,33 @@ int wps_show(void) | |||
248 | mpeg_next(); | 257 | mpeg_next(); |
249 | break; | 258 | break; |
250 | 259 | ||
260 | #ifdef HAVE_PLAYER_KEYPAD | ||
261 | case BUTTON_LEFT | BUTTON_ON: | ||
262 | dont_quit = true; | ||
263 | global_settings.volume--; | ||
264 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | ||
265 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | ||
266 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | ||
267 | break; | ||
268 | |||
269 | case BUTTON_RIGHT | BUTTON_ON: | ||
270 | dont_quit = true; | ||
271 | global_settings.volume++; | ||
272 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | ||
273 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | ||
274 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | ||
275 | break; | ||
276 | |||
277 | case BUTTON_ON | BUTTON_REL: | ||
278 | /* Quit if ON has been pressed without changing | ||
279 | the volume */ | ||
280 | if(!dont_quit) | ||
281 | return 0; | ||
282 | |||
283 | dont_quit = false; | ||
284 | break; | ||
285 | #endif | ||
286 | |||
251 | #ifdef HAVE_RECORDER_KEYPAD | 287 | #ifdef HAVE_RECORDER_KEYPAD |
252 | case BUTTON_F1: | 288 | case BUTTON_F1: |
253 | #else | 289 | #else |