diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2008-09-05 18:57:47 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2008-09-05 18:57:47 +0000 |
commit | 66b211addd76d3f9102460a69cacc868d7d70dfa (patch) | |
tree | 0b3c4171d682bca3e67191ff337ff84a44d4b02b | |
parent | c1e86f7531e82936cc5c33fce5b7231787cfd84a (diff) | |
download | rockbox-66b211addd76d3f9102460a69cacc868d7d70dfa.tar.gz rockbox-66b211addd76d3f9102460a69cacc868d7d70dfa.zip |
WpsEditor: add support for greyscale targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18424 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | utils/wpseditor/libwps/Makefile | 15 | ||||
-rw-r--r-- | utils/wpseditor/libwps/src/dummies.c | 10 | ||||
-rw-r--r-- | utils/wpseditor/libwps/src/lcd.c | 12 |
3 files changed, 31 insertions, 6 deletions
diff --git a/utils/wpseditor/libwps/Makefile b/utils/wpseditor/libwps/Makefile index 17046e8488..6abc1d8d8d 100644 --- a/utils/wpseditor/libwps/Makefile +++ b/utils/wpseditor/libwps/Makefile | |||
@@ -33,11 +33,22 @@ TARGETS=IRIVER_H10 \ | |||
33 | IPOD_COLOR \ | 33 | IPOD_COLOR \ |
34 | IPOD_NANO \ | 34 | IPOD_NANO \ |
35 | IPOD_VIDEO \ | 35 | IPOD_VIDEO \ |
36 | IPOD_3G \ | ||
37 | IPOD_4G \ | ||
38 | IPOD_MINI \ | ||
39 | IPOD_MINI2G \ | ||
40 | IPOD_1G2G \ | ||
36 | GIGABEAT_F \ | 41 | GIGABEAT_F \ |
37 | GIGABEAT_S \ | 42 | GIGABEAT_S \ |
38 | SANSA_E200 \ | 43 | SANSA_E200 \ |
39 | SANSA_C200 | 44 | SANSA_C200 \ |
40 | 45 | IRIVER_H100 \ | |
46 | IRIVER_H120 \ | ||
47 | IRIVER_H300 \ | ||
48 | IAUDIO_X5 \ | ||
49 | IAUDIO_M5 \ | ||
50 | IAUDIO_M3 \ | ||
51 | |||
41 | SOURCES= \ | 52 | SOURCES= \ |
42 | src/api.c \ | 53 | src/api.c \ |
43 | src/dummies.c \ | 54 | src/dummies.c \ |
diff --git a/utils/wpseditor/libwps/src/dummies.c b/utils/wpseditor/libwps/src/dummies.c index 8592610701..002cf93c60 100644 --- a/utils/wpseditor/libwps/src/dummies.c +++ b/utils/wpseditor/libwps/src/dummies.c | |||
@@ -177,7 +177,7 @@ void cue_draw_markers(struct screen *screen, unsigned long tracklen, | |||
177 | int x1, int x2, int y, int h){} | 177 | int x1, int x2, int y, int h){} |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | 180 | #ifdef HAVE_ALBUMART | |
181 | void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear) | 181 | void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear) |
182 | { | 182 | { |
183 | if (!gwps || !gwps->data || !gwps->display || handle_id < 0) | 183 | if (!gwps || !gwps->data || !gwps->display || handle_id < 0) |
@@ -240,7 +240,7 @@ void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear) | |||
240 | gwps->display->set_drawmode(DRMODE_SOLID); | 240 | gwps->display->set_drawmode(DRMODE_SOLID); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | 243 | #endif | |
244 | /* Update the "data" pointer to make the handle's data available to the caller. | 244 | /* Update the "data" pointer to make the handle's data available to the caller. |
245 | Return the length of the available linear data or < 0 for failure (handle | 245 | Return the length of the available linear data or < 0 for failure (handle |
246 | not found). | 246 | not found). |
@@ -274,6 +274,10 @@ void unload_wps_backdrop(void) | |||
274 | { | 274 | { |
275 | 275 | ||
276 | } | 276 | } |
277 | void unload_remote_wps_backdrop(void) | ||
278 | { | ||
279 | |||
280 | } | ||
277 | 281 | ||
278 | #if CONFIG_CODEC == SWCODEC | 282 | #if CONFIG_CODEC == SWCODEC |
279 | int get_replaygain_mode(bool have_track_gain, bool have_album_gain) | 283 | int get_replaygain_mode(bool have_track_gain, bool have_album_gain) |
@@ -299,6 +303,8 @@ int rtc_write_datetime(unsigned char* buf){return 0;} | |||
299 | void backlight_on(void){} | 303 | void backlight_on(void){} |
300 | void backlight_off(void){} | 304 | void backlight_off(void){} |
301 | 305 | ||
306 | void remote_backlight_on(void){} | ||
307 | void remote_backlight_off(void){} | ||
302 | 308 | ||
303 | void debugf(const char *fmt, ...) | 309 | void debugf(const char *fmt, ...) |
304 | {} | 310 | {} |
diff --git a/utils/wpseditor/libwps/src/lcd.c b/utils/wpseditor/libwps/src/lcd.c index 1f12332750..c3f16c9946 100644 --- a/utils/wpseditor/libwps/src/lcd.c +++ b/utils/wpseditor/libwps/src/lcd.c | |||
@@ -12,13 +12,19 @@ static struct viewport default_vp = | |||
12 | .y = 0, | 12 | .y = 0, |
13 | .width = LCD_WIDTH, | 13 | .width = LCD_WIDTH, |
14 | .height = LCD_HEIGHT, | 14 | .height = LCD_HEIGHT, |
15 | #ifdef HAVE_LCD_BITMAP | ||
15 | .font = FONT_SYSFIXED, | 16 | .font = FONT_SYSFIXED, |
16 | .drawmode = DRMODE_SOLID, | 17 | .drawmode = DRMODE_SOLID, |
18 | #endif | ||
19 | #if LCD_DEPTH > 1 | ||
17 | .fg_pattern = LCD_DEFAULT_FG, | 20 | .fg_pattern = LCD_DEFAULT_FG, |
18 | .bg_pattern = LCD_DEFAULT_BG, | 21 | .bg_pattern = LCD_DEFAULT_BG, |
22 | #ifdef HAVE_LCD_COLOR | ||
19 | .lss_pattern = LCD_DEFAULT_BG, | 23 | .lss_pattern = LCD_DEFAULT_BG, |
20 | .lse_pattern = LCD_DEFAULT_BG, | 24 | .lse_pattern = LCD_DEFAULT_BG, |
21 | .lst_pattern = LCD_DEFAULT_BG, | 25 | .lst_pattern = LCD_DEFAULT_BG, |
26 | #endif | ||
27 | #endif | ||
22 | }; | 28 | }; |
23 | 29 | ||
24 | struct viewport* current_vp = &default_vp; | 30 | struct viewport* current_vp = &default_vp; |
@@ -65,7 +71,7 @@ int lcd_get_drawmode(void) | |||
65 | { | 71 | { |
66 | return current_vp->drawmode; | 72 | return current_vp->drawmode; |
67 | } | 73 | } |
68 | 74 | #if LCD_DEPTH > 1 | |
69 | void lcd_set_foreground(unsigned color) | 75 | void lcd_set_foreground(unsigned color) |
70 | { | 76 | { |
71 | current_vp->fg_pattern = color; | 77 | current_vp->fg_pattern = color; |
@@ -86,6 +92,7 @@ unsigned lcd_get_background(void) | |||
86 | return current_vp->bg_pattern; | 92 | return current_vp->bg_pattern; |
87 | } | 93 | } |
88 | 94 | ||
95 | #ifdef HAVE_LCD_COLOR | ||
89 | void lcd_set_selector_start(unsigned color) | 96 | void lcd_set_selector_start(unsigned color) |
90 | { | 97 | { |
91 | current_vp->lss_pattern = color; | 98 | current_vp->lss_pattern = color; |
@@ -107,7 +114,8 @@ void lcd_set_drawinfo(int mode, unsigned fg_color, unsigned bg_color) | |||
107 | current_vp->fg_pattern = fg_color; | 114 | current_vp->fg_pattern = fg_color; |
108 | current_vp->bg_pattern = bg_color; | 115 | current_vp->bg_pattern = bg_color; |
109 | } | 116 | } |
110 | 117 | #endif | |
118 | #endif | ||
111 | int lcd_getwidth(void) | 119 | int lcd_getwidth(void) |
112 | { | 120 | { |
113 | return current_vp->width; | 121 | return current_vp->width; |