diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-26 16:06:59 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-26 16:06:59 +0000 |
| commit | ade5d7b848bf9c0d46bb14c85528453f969c9429 (patch) | |
| tree | 197aa919b9a3c2a89f77d12b01cc1c2c23f7e37f /apps/sound_menu.c | |
| parent | 3d91885718a1fb9d6d55f07f67a9a1942a352c5e (diff) | |
| download | rockbox-ade5d7b848bf9c0d46bb14c85528453f969c9429.zip rockbox-ade5d7b848bf9c0d46bb14c85528453f969c9429.tar.gz rockbox-ade5d7b848bf9c0d46bb14c85528453f969c9429.tar.bz2 rockbox-ade5d7b848bf9c0d46bb14c85528453f969c9429.tar.xz | |
First step in revamping the USB event handling, paving the way for the upcoming SYS_POWER_OFF event
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4951 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/sound_menu.c')
| -rw-r--r-- | apps/sound_menu.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 4c9087e..6f62ce2 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -33,6 +33,7 @@ #include "lang.h" #include "sprintf.h" #include "talk.h" +#include "misc.h" static char *fmt[] = { @@ -56,6 +57,7 @@ bool set_sound(char* string, char str[32]; int talkunit = UNIT_INT; int steps; + int button; unit = mpeg_sound_unit(setting); numdec = mpeg_sound_numdecimals(setting); @@ -99,7 +101,8 @@ bool set_sound(char* string, lcd_update(); changed = false; - switch( button_get_w_tmo(HZ/2) ) { + button = button_get_w_tmo(HZ/2); + switch( button ) { #ifdef HAVE_RECORDER_KEYPAD case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: @@ -136,9 +139,10 @@ bool set_sound(char* string, done = true; break; - case SYS_USB_CONNECTED: - usb_screen(); - return true; + default: + if(default_event_handler(button) == SYS_USB_CONNECTED) + return true; + break; } if (changed) { mpeg_sound_set(setting, *variable); |