diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/SOURCES | 1 | ||||
-rw-r--r-- | apps/debug_menu.c | 4 | ||||
-rw-r--r-- | apps/logfdisp.c | 13 | ||||
-rw-r--r-- | apps/logfdisp.h | 7 | ||||
-rw-r--r-- | apps/main_menu.c | 25 |
5 files changed, 28 insertions, 22 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 10a04da6ea..8bf0ed37db 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -1,3 +1,4 @@ | |||
1 | logfdisp.c | ||
1 | alarm_menu.c | 2 | alarm_menu.c |
2 | bookmark.c | 3 | bookmark.c |
3 | credits.c | 4 | credits.c |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 044e5f73e3..5f4e67f537 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -57,6 +57,7 @@ | |||
57 | #ifdef HAVE_MMC | 57 | #ifdef HAVE_MMC |
58 | #include "ata_mmc.h" | 58 | #include "ata_mmc.h" |
59 | #endif | 59 | #endif |
60 | #include "logfdisp.h" | ||
60 | 61 | ||
61 | #ifdef IRIVER_H100 | 62 | #ifdef IRIVER_H100 |
62 | #include "uda1380.h" | 63 | #include "uda1380.h" |
@@ -2047,6 +2048,9 @@ bool debug_menu(void) | |||
2047 | #ifdef CONFIG_TUNER | 2048 | #ifdef CONFIG_TUNER |
2048 | { "FM Radio", dbg_fm_radio }, | 2049 | { "FM Radio", dbg_fm_radio }, |
2049 | #endif | 2050 | #endif |
2051 | #ifdef ROCKBOX_HAS_LOGF | ||
2052 | {"logf", logfdisplay }, | ||
2053 | #endif | ||
2050 | }; | 2054 | }; |
2051 | 2055 | ||
2052 | m=menu_init( items, sizeof items / sizeof(struct menu_item), NULL, | 2056 | m=menu_init( items, sizeof items / sizeof(struct menu_item), NULL, |
diff --git a/apps/logfdisp.c b/apps/logfdisp.c index 510cb28b57..36c4997aa8 100644 --- a/apps/logfdisp.c +++ b/apps/logfdisp.c | |||
@@ -17,6 +17,8 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "config.h" | 19 | #include "config.h" |
20 | |||
21 | #ifdef ROCKBOX_HAS_LOGF | ||
20 | #include <timefuncs.h> | 22 | #include <timefuncs.h> |
21 | #include <string.h> | 23 | #include <string.h> |
22 | #include <kernel.h> | 24 | #include <kernel.h> |
@@ -74,4 +76,13 @@ bool logfdisplay(void) | |||
74 | 76 | ||
75 | return false; | 77 | return false; |
76 | } | 78 | } |
77 | #endif | 79 | #else /* HAVE_LCD_BITMAP */ |
80 | bool logfdisplay(void) | ||
81 | |||
82 | { | ||
83 | /* TODO: implement a browser for charcell bitmaps */ | ||
84 | return false; | ||
85 | } | ||
86 | #endif /* HAVE_LCD_BITMAP */ | ||
87 | |||
88 | #endif /* ROCKBOX_HAS_LOGF */ | ||
diff --git a/apps/logfdisp.h b/apps/logfdisp.h index 58ec9b9969..1b0d8c9ddb 100644 --- a/apps/logfdisp.h +++ b/apps/logfdisp.h | |||
@@ -16,6 +16,9 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifdef HAVE_LCD_BITMAP | 19 | #ifndef LOGFDISP_H |
20 | #define LOGFDISP_H | ||
20 | bool logfdisplay(void); | 21 | bool logfdisplay(void); |
21 | #endif | 22 | |
23 | #endif /* LOGFDISP_H */ | ||
24 | |||
diff --git a/apps/main_menu.c b/apps/main_menu.c index e1bf424d36..44321142c8 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #endif | 51 | #endif |
52 | #include "misc.h" | 52 | #include "misc.h" |
53 | #include "lang.h" | 53 | #include "lang.h" |
54 | #include "logfdisp.h" | ||
54 | 55 | ||
55 | #ifdef HAVE_RECORDING | 56 | #ifdef HAVE_RECORDING |
56 | #include "recording.h" | 57 | #include "recording.h" |
@@ -80,25 +81,8 @@ int show_logo( void ) | |||
80 | #endif | 81 | #endif |
81 | 82 | ||
82 | #ifdef HAVE_REMOTE_LCD | 83 | #ifdef HAVE_REMOTE_LCD |
83 | lcd_remote_bitmap(rockbox112x37,10,14,112,37, false); | 84 | lcd_remote_clear_display(); |
84 | #endif | 85 | lcd_remote_bitmap(rockbox112x37,10,14,112,37, false); |
85 | |||
86 | #if 0 | ||
87 | /* | ||
88 | * This code is not used anymore, but I kept it here since it shows | ||
89 | * one way of using the BMP reader function to display an externally | ||
90 | * providing logo. | ||
91 | */ | ||
92 | unsigned char buffer[112 * 8]; | ||
93 | int width, height; | ||
94 | |||
95 | int failure; | ||
96 | failure = read_bmp_file("/rockbox112.bmp", &width, &height, buffer); | ||
97 | |||
98 | debugf("read_bmp_file() returned %d, width %d height %d\n", | ||
99 | failure, width, height); | ||
100 | |||
101 | lcd_bitmap(&buffer, 0, 10, width, height, false); | ||
102 | #endif | 86 | #endif |
103 | 87 | ||
104 | snprintf(version, sizeof(version), "Ver. %s", appsversion); | 88 | snprintf(version, sizeof(version), "Ver. %s", appsversion); |
@@ -365,6 +349,9 @@ bool info_menu(void) | |||
365 | { ID2P(LANG_DEBUG), debug_menu }, | 349 | { ID2P(LANG_DEBUG), debug_menu }, |
366 | #else | 350 | #else |
367 | { ID2P(LANG_USB), simulate_usb }, | 351 | { ID2P(LANG_USB), simulate_usb }, |
352 | #ifdef ROCKBOX_HAS_LOGF | ||
353 | {"logf", logfdisplay }, | ||
354 | #endif | ||
368 | #endif | 355 | #endif |
369 | }; | 356 | }; |
370 | 357 | ||