diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-04 15:46:41 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-04 15:46:41 +0000 |
commit | 20f76d61ae58bd47b647d79e40beebbbe747e480 (patch) | |
tree | d37569a127b02fdd051c6a3da77c70ac2d72e8ab /apps/plugins/lib/feature_wrappers.h | |
parent | dfb24d6ceee703361b8120d689d8d77cfc15830d (diff) | |
download | rockbox-20f76d61ae58bd47b647d79e40beebbbe747e480.tar.gz rockbox-20f76d61ae58bd47b647d79e40beebbbe747e480.zip |
Make JPEG and BMP scaler optional with HAVE_JPEG and HAVE_BMP_SCALING, both defined for all targets that have HAVE_ALBUMART. Disable JPEG in PictureFlow and pluginlib album art search with 32KiB plugin buffer until PictureFlow
gets overlay support.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20851 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib/feature_wrappers.h')
-rw-r--r-- | apps/plugins/lib/feature_wrappers.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/apps/plugins/lib/feature_wrappers.h b/apps/plugins/lib/feature_wrappers.h index 3f47f23c00..50552fbda4 100644 --- a/apps/plugins/lib/feature_wrappers.h +++ b/apps/plugins/lib/feature_wrappers.h | |||
@@ -30,24 +30,27 @@ | |||
30 | * but can easily be implement in pluginlib as long as the database is | 30 | * but can easily be implement in pluginlib as long as the database is |
31 | * available. | 31 | * available. |
32 | */ | 32 | */ |
33 | #ifdef HAVE_ALBUMART | 33 | #if defined(HAVE_ALBUMART) && defined(HAVE_JPEG) |
34 | #define search_albumart_files rb->search_albumart_files | 34 | #define search_albumart_files rb->search_albumart_files |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | /* This should only be used when loading scaled bitmaps, or using custom output | 37 | /* This should only be used when loading scaled bitmaps, or using custom output |
38 | * plugins. The pluginlib loader does not support loading bitmaps unscaled in | 38 | * plugins. A native output plugin for the scaler is available as format_native |
39 | * native format, so rb->read_bmp_file should always be used directly to load | 39 | * on targets with LCD_DEPTH > 1 |
40 | * such images. | ||
41 | */ | 40 | */ |
42 | #if LCD_DEPTH > 1 | 41 | #ifdef HAVE_BMP_SCALING |
43 | #define scaled_read_bmp_file rb->read_bmp_file | 42 | #define scaled_read_bmp_file rb->read_bmp_file |
44 | #define scaled_read_bmp_fd rb->read_bmp_fd | 43 | #define scaled_read_bmp_fd rb->read_bmp_fd |
45 | #define read_jpeg_file rb->read_jpeg_file | ||
46 | #define read_jpeg_fd rb->read_jpeg_fd | ||
47 | #else | 44 | #else |
48 | #define scaled_read_bmp_file read_bmp_file | 45 | #define scaled_read_bmp_file read_bmp_file |
49 | #define scaled_read_bmp_fd read_bmp_fd | 46 | #define scaled_read_bmp_fd read_bmp_fd |
50 | #endif | 47 | #endif |
51 | 48 | ||
49 | #ifdef HAVE_JPEG | ||
50 | #define read_jpeg_file rb->read_jpeg_file | ||
51 | #define read_jpeg_fd rb->read_jpeg_fd | ||
52 | #else | ||
53 | #endif | ||
54 | |||
52 | #endif | 55 | #endif |
53 | 56 | ||