diff options
| author | Nils Wallménius <nils@rockbox.org> | 2008-01-24 17:49:06 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2008-01-24 17:49:06 +0000 |
| commit | 5677b4cfd732d51193d2618bb31ea1adb5394672 (patch) | |
| tree | 3f08b5acefed289bfeec3837feb2b7445726d62f /apps/plugins | |
| parent | 60baa54eeda9d3ba76aaf10e24abb4154f2ebab8 (diff) | |
| download | rockbox-5677b4cfd732d51193d2618bb31ea1adb5394672.zip rockbox-5677b4cfd732d51193d2618bb31ea1adb5394672.tar.gz rockbox-5677b4cfd732d51193d2618bb31ea1adb5394672.tar.bz2 rockbox-5677b4cfd732d51193d2618bb31ea1adb5394672.tar.xz | |
Oops, forgot to change some #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16156 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/jpeg.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 0eb9401..4ad92ee 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -27,15 +27,12 @@ #include "playback_control.h" #include "oldmenuapi.h" #include "helper.h" +#include "lib/configfile.h" #ifdef HAVE_LCD_BITMAP #include "grey.h" #include "xlcd.h" -#ifdef HAVE_LCD_COLOR -#include "lib/configfile.h" -#endif - PLUGIN_HEADER /* variable button definitions */ @@ -229,9 +226,7 @@ static int running_slideshow = false; /* loading image because of slideshw */ static int immediate_ata_off = false; /* power down disk after loading */ #endif -#ifdef HAVE_LCD_COLOR - -/* Persistent configuration - only needed for color displays atm */ +/* Persistent configuration */ #define JPEG_CONFIGFILE "jpeg.cfg" #define JPEG_SETTINGS_MINVERSION 1 #define JPEG_SETTINGS_VERSION 2 @@ -269,15 +264,16 @@ static struct jpeg_settings old_settings; static struct configdata jpeg_config[] = { +#ifdef HAVE_LCD_COLOR { TYPE_ENUM, 0, COLOUR_NUM_MODES, &jpeg_settings.colour_mode, "Colour Mode", (char *[]){ "Colour", "Grayscale" }, NULL }, { TYPE_ENUM, 0, DITHER_NUM_MODES, &jpeg_settings.dither_mode, "Dither Mode", (char *[]){ "None", "Ordered", "Diffusion" }, NULL }, +#endif { TYPE_INT, SS_MIN_TIMEOUT, SS_MAX_TIMEOUT, &jpeg_settings.ss_timeout, "Slideshow Time", NULL, NULL}, }; -#endif /* HAVE_LCD_COLOR */ #if LCD_DEPTH > 1 fb_data* old_backdrop; #endif @@ -3301,14 +3297,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) xlcd_init(rb); #endif -#ifdef HAVE_LCD_COLOR /* should be ok to just load settings since a parameter is present here and the drive should be spinning */ configfile_init(rb); configfile_load(JPEG_CONFIGFILE, jpeg_config, ARRAYLEN(jpeg_config), JPEG_SETTINGS_MINVERSION); old_settings = jpeg_settings; -#endif buf_images = buf; buf_images_size = buf_size; @@ -3321,7 +3315,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) }while (condition != PLUGIN_OK && condition != PLUGIN_USB_CONNECTED && condition != PLUGIN_ERROR); -#ifdef HAVE_LCD_COLOR if (rb->memcmp(&jpeg_settings, &old_settings, sizeof (jpeg_settings))) { /* Just in case drive has to spin, keep it from looking locked */ @@ -3329,7 +3322,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) configfile_save(JPEG_CONFIGFILE, jpeg_config, ARRAYLEN(jpeg_config), JPEG_SETTINGS_VERSION); } -#endif #if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) /* set back ata spindown time in case we changed it */ |