diff options
author | Dave Chapman <dave@dchapman.com> | 2006-05-20 13:47:08 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-05-20 13:47:08 +0000 |
commit | 217f54bc6949ee957b62e30987d01232fcd97a76 (patch) | |
tree | 03e0dd48ed0a3510b1fe43f05e73f5eb8a16f533 /apps/plugins/jpeg.c | |
parent | 8784dd4de53c9b4ce3a17e44b015d43902eb30a5 (diff) | |
download | rockbox-217f54bc6949ee957b62e30987d01232fcd97a76.tar.gz rockbox-217f54bc6949ee957b62e30987d01232fcd97a76.zip |
Patch #5362 from Alexander Spyridakis - fixes bugs #5159 and #5061
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9967 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/jpeg.c')
-rw-r--r-- | apps/plugins/jpeg.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index e44e243d41..c36eb8a0ee 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -83,13 +83,11 @@ PLUGIN_HEADER | |||
83 | #define JPEG_LEFT BUTTON_LEFT | 83 | #define JPEG_LEFT BUTTON_LEFT |
84 | #define JPEG_RIGHT BUTTON_RIGHT | 84 | #define JPEG_RIGHT BUTTON_RIGHT |
85 | #define JPEG_MENU (BUTTON_SELECT | BUTTON_MENU) | 85 | #define JPEG_MENU (BUTTON_SELECT | BUTTON_MENU) |
86 | #define JPEG_NEXT_PRE (BUTTON_SELECT | BUTTON_RIGHT) | 86 | #define JPEG_NEXT (BUTTON_SELECT | BUTTON_RIGHT) |
87 | #define JPEG_NEXT (BUTTON_SELECT | BUTTON_RIGHT | BUTTON_REL) | 87 | #define JPEG_PREVIOUS (BUTTON_SELECT | BUTTON_LEFT) |
88 | #define JPEG_TOGGLE_SLIDESHOW (BUTTON_SELECT | BUTTON_RIGHT | BUTTON_REPEAT) | ||
89 | #define JPEG_PREVIOUS (BUTTON_SELECT |BUTTON_LEFT) | ||
90 | 88 | ||
91 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 89 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD |
92 | #define JPEG_ZOOM_IN_PRE BUTTON_SELECT | 90 | #define JPEG_ZOOM_PRE BUTTON_SELECT |
93 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 91 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
94 | #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 92 | #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
95 | #define JPEG_UP BUTTON_UP | 93 | #define JPEG_UP BUTTON_UP |
@@ -97,13 +95,11 @@ PLUGIN_HEADER | |||
97 | #define JPEG_LEFT BUTTON_LEFT | 95 | #define JPEG_LEFT BUTTON_LEFT |
98 | #define JPEG_RIGHT BUTTON_RIGHT | 96 | #define JPEG_RIGHT BUTTON_RIGHT |
99 | #define JPEG_MENU BUTTON_POWER | 97 | #define JPEG_MENU BUTTON_POWER |
100 | #define JPEG_NEXT_PRE BUTTON_PLAY | 98 | #define JPEG_NEXT BUTTON_PLAY |
101 | #define JPEG_NEXT (BUTTON_PLAY|BUTTON_REL) | ||
102 | #define JPEG_TOGGLE_SLIDESHOW (BUTTON_PLAY|BUTTON_REPEAT) | ||
103 | #define JPEG_PREVIOUS BUTTON_REC | 99 | #define JPEG_PREVIOUS BUTTON_REC |
104 | 100 | ||
105 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 101 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
106 | #define JPEG_ZOOM_IN_PRE BUTTON_MENU | 102 | #define JPEG_ZOOM_PRE BUTTON_MENU |
107 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 103 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
108 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) | 104 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) |
109 | #define JPEG_UP BUTTON_UP | 105 | #define JPEG_UP BUTTON_UP |
@@ -2267,10 +2263,6 @@ int scroll_bmp(struct t_disp* pdisp) | |||
2267 | return change_filename(DIR_NEXT); | 2263 | return change_filename(DIR_NEXT); |
2268 | break; | 2264 | break; |
2269 | case JPEG_NEXT: | 2265 | case JPEG_NEXT: |
2270 | #ifdef JPEG_NEXT_PRE | ||
2271 | if (lastbutton != JPEG_NEXT_PRE) | ||
2272 | break; | ||
2273 | #endif | ||
2274 | if (entries > 0) | 2266 | if (entries > 0) |
2275 | return change_filename(DIR_NEXT); | 2267 | return change_filename(DIR_NEXT); |
2276 | break; | 2268 | break; |
@@ -2756,11 +2748,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2756 | get_pic_list(); | 2748 | get_pic_list(); |
2757 | 2749 | ||
2758 | #if (PLUGIN_BUFFER_SIZE >= MIN_MEM) && !defined(SIMULATOR) | 2750 | #if (PLUGIN_BUFFER_SIZE >= MIN_MEM) && !defined(SIMULATOR) |
2759 | #if CONFIG_CODEC == SWCODEC | 2751 | if(rb->audio_status()) |
2760 | if(rb->pcm_is_playing()) | ||
2761 | #else | ||
2762 | if(rb->mp3_is_playing()) | ||
2763 | #endif | ||
2764 | { | 2752 | { |
2765 | buf = rb->plugin_get_buffer(&buf_size) + | 2753 | buf = rb->plugin_get_buffer(&buf_size) + |
2766 | (entries * sizeof(char**)); | 2754 | (entries * sizeof(char**)); |