diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-22 23:16:36 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-22 23:16:36 +0000 |
| commit | 50ba8da88c73c32d00da77b29a6fb75915e5f964 (patch) | |
| tree | 16e82909938af57febc8cc8fb6faf3edbcd5f3d0 /apps | |
| parent | 2d758f282e8c8edf5c7f1468283d9ed39aac52d7 (diff) | |
Ooops. I accidentally reverted some earlier patches. Now they are back.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1411 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/wps.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/apps/wps.c b/apps/wps.c index 5e6cfb0449..8d81fc5c2f 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -33,6 +33,7 @@ #include "usb.h" #include "power.h" #include "status.h" +#include "main_menu.h" #define LINE_Y 1 /* initial line */ @@ -141,6 +142,7 @@ int wps_show(void) ( (id3->album?id3->album[0]:0) != lastalbum ) || ( (id3->title?id3->title[0]:0) != lasttitle ) ) { + lcd_stop_scroll(); draw_screen(id3); lastlength = id3->length; lastsize = id3->filesize; @@ -184,7 +186,7 @@ int wps_show(void) #ifdef HAVE_LCD_BITMAP /* draw battery indicator line */ lcd_clearline(0,LCD_HEIGHT-1,LCD_WIDTH-1, LCD_HEIGHT-1); - lcd_drawline(0,LCD_HEIGHT-1,battery_level() * LCD_WIDTH / 100, LCD_HEIGHT-1); + lcd_drawline(0,LCD_HEIGHT-1,battery_level() * (LCD_WIDTH-1) / 100, LCD_HEIGHT-1); #endif for ( i=0;i<5;i++ ) { @@ -235,6 +237,16 @@ int wps_show(void) mpeg_next(); break; +#ifdef HAVE_RECORDER_KEYPAD + case BUTTON_F1: +#else + case BUTTON_MENU: +#endif + lcd_stop_scroll(); + main_menu(); + draw_screen(id3); + break; + #ifdef HAVE_RECORDER_KEYPAD case BUTTON_OFF: #else |