diff options
Diffstat (limited to 'apps/gui/quickscreen.h')
-rw-r--r-- | apps/gui/quickscreen.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h index 09a0390d93..fdbe4db386 100644 --- a/apps/gui/quickscreen.h +++ b/apps/gui/quickscreen.h | |||
@@ -34,10 +34,8 @@ | |||
34 | #define QUICKSCREEN_BOTTOM_INV BUTTON_UP | 34 | #define QUICKSCREEN_BOTTOM_INV BUTTON_UP |
35 | #define QUICKSCREEN_RIGHT BUTTON_RIGHT | 35 | #define QUICKSCREEN_RIGHT BUTTON_RIGHT |
36 | 36 | ||
37 | #if CONFIG_KEYPAD == RECORDER_PAD | 37 | |
38 | #define QUICKSCREEN_QUIT BUTTON_F2 | 38 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
39 | #define QUICKSCREEN_QUIT2 BUTTON_F3 | ||
40 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
41 | #define QUICKSCREEN_QUIT BUTTON_MODE | 39 | #define QUICKSCREEN_QUIT BUTTON_MODE |
42 | #define QUICKSCREEN_QUIT2 BUTTON_OFF | 40 | #define QUICKSCREEN_QUIT2 BUTTON_OFF |
43 | #define QUICKSCREEN_RC_QUIT BUTTON_RC_MODE | 41 | #define QUICKSCREEN_RC_QUIT BUTTON_RC_MODE |
@@ -104,11 +102,12 @@ bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button); | |||
104 | void gui_syncquickscreen_draw(struct gui_quickscreen * qs); | 102 | void gui_syncquickscreen_draw(struct gui_quickscreen * qs); |
105 | 103 | ||
106 | /* | 104 | /* |
107 | * Runs the quickscreen on all available screens | 105 | * Runs the quickscreen on all available screens, if button_enter is released, quits |
108 | * - qs : the quickscreen | 106 | * - qs : the quickscreen |
107 | * - button_enter : button pressed at the same time the quickscreen is displayed | ||
109 | * returns : true if usb was connected, false otherwise | 108 | * returns : true if usb was connected, false otherwise |
110 | */ | 109 | */ |
111 | bool gui_syncquickscreen_run(struct gui_quickscreen * qs); | 110 | bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter); |
112 | 111 | ||
113 | #endif /*_GUI_QUICK_SCREEN_H_*/ | 112 | #endif /*_GUI_QUICK_SCREEN_H_*/ |
114 | #endif /* CONFIG_KEYPAD */ | 113 | #endif /* CONFIG_KEYPAD */ |