diff options
author | Jens Arnold <amiconn@rockbox.org> | 2009-02-10 23:43:37 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2009-02-10 23:43:37 +0000 |
commit | 11ad7b4bc8bcb049040c02fae04074faf5dfaf27 (patch) | |
tree | ce92c57120cb9b019743a863083f654e8d80f95f /uisimulator/sdl/lcd-bitmap.c | |
parent | eddb5680f9aefecdaccf24279cff2d3cf4fd5d86 (diff) | |
download | rockbox-11ad7b4bc8bcb049040c02fae04074faf5dfaf27.tar.gz rockbox-11ad7b4bc8bcb049040c02fae04074faf5dfaf27.zip |
Move screendump from apps to firmware, solving two nasty firmware-to-apps calls. This required to move the filename creation functions as well. * Fix bug in the BMP header of Clip screendumps. * Add remote screendump for targets with an LCD remote. * Simplify some ifdefs and rename a macro in the sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19967 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/sdl/lcd-bitmap.c')
-rw-r--r-- | uisimulator/sdl/lcd-bitmap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/uisimulator/sdl/lcd-bitmap.c b/uisimulator/sdl/lcd-bitmap.c index 8caac784ef..378889c417 100644 --- a/uisimulator/sdl/lcd-bitmap.c +++ b/uisimulator/sdl/lcd-bitmap.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include "debug.h" | 22 | #include "debug.h" |
23 | #include "uisdl.h" | 23 | #include "uisdl.h" |
24 | #include "lcd-sdl.h" | 24 | #include "lcd-sdl.h" |
25 | #include "misc.h" | 25 | #include "screendump.h" |
26 | 26 | ||
27 | SDL_Surface* lcd_surface; | 27 | SDL_Surface* lcd_surface; |
28 | 28 | ||
@@ -166,14 +166,12 @@ void sim_lcd_init(void) | |||
166 | SIM_LCD_WIDTH * display_zoom, | 166 | SIM_LCD_WIDTH * display_zoom, |
167 | SIM_LCD_HEIGHT * display_zoom, | 167 | SIM_LCD_HEIGHT * display_zoom, |
168 | LCD_DEPTH, 0, 0, 0, 0); | 168 | LCD_DEPTH, 0, 0, 0, 0); |
169 | #else | 169 | #elif LCD_DEPTH <= 8 |
170 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, | 170 | lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, |
171 | SIM_LCD_WIDTH * display_zoom, | 171 | SIM_LCD_WIDTH * display_zoom, |
172 | SIM_LCD_HEIGHT * display_zoom, | 172 | SIM_LCD_HEIGHT * display_zoom, |
173 | 8, 0, 0, 0, 0); | 173 | 8, 0, 0, 0, 0); |
174 | #endif | ||
175 | 174 | ||
176 | #if LCD_DEPTH <= 8 | ||
177 | #ifdef HAVE_BACKLIGHT | 175 | #ifdef HAVE_BACKLIGHT |
178 | sdl_set_gradient(lcd_surface, &lcd_bl_color_dark, | 176 | sdl_set_gradient(lcd_surface, &lcd_bl_color_dark, |
179 | &lcd_bl_color_bright, 0, NUM_SHADES); | 177 | &lcd_bl_color_bright, 0, NUM_SHADES); |
@@ -189,7 +187,7 @@ void sim_lcd_init(void) | |||
189 | &lcd_color2_bright, NUM_SHADES, NUM_SHADES); | 187 | &lcd_color2_bright, NUM_SHADES, NUM_SHADES); |
190 | #endif | 188 | #endif |
191 | #endif /* !HAVE_BACKLIGHT */ | 189 | #endif /* !HAVE_BACKLIGHT */ |
192 | #endif /* LCD_DEPTH < 8 */ | 190 | #endif /* LCD_DEPTH */ |
193 | } | 191 | } |
194 | 192 | ||
195 | #if LCD_DEPTH < 8 | 193 | #if LCD_DEPTH < 8 |