Added multi-screen support for quickscreen (mostly rewritten from scratch) and USB screen ; just looking at the hour makes me think it could be buggy

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8039 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 9 deletions

diff --git a/apps/screens.h b/apps/screens.h
index 60a1537e99..3de66582ee 100644
--- a/apps/screens.h
+++ b/apps/screens.h
@@ -22,7 +22,9 @@
 #include "config.h"
 #include "timefuncs.h"
 
-void usb_display_info(void);
+struct screen;
+
+void usb_display_info(struct screen * display);
 void usb_screen(void);
 int charging_screen(void);
 void charging_splash(void);
@@ -33,15 +35,9 @@ int mmc_remove_request(void);
 
 #if CONFIG_KEYPAD == RECORDER_PAD
 int pitch_screen(void);
-bool quick_screen(const int, const int);
-#define SCREENS_QUICK   BUTTON_F2
-#endif
- 
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-bool quick_screen(const int, const int);
-#define SCREENS_QUICK   BUTTON_MODE
-   /* Long press already detected so not needed here */
+extern bool quick_screen_f3(void);
 #endif
+extern bool quick_screen_quick(void);
 
 #ifdef HAVE_RTC
 bool set_time_screen(const char* string, struct tm *tm);