diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-04-08 10:27:38 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-04-08 10:27:38 +0000 |
commit | 54a0aeff5b2f086b871a4f2fa11f4ad4080a1bce (patch) | |
tree | b80fcb2e033b7999e63eaf86ca28fb6dce0e5102 | |
parent | 5b72c4eb85fb40422b2d269d5b0f1c7adbe55357 (diff) | |
download | rockbox-54a0aeff5b2f086b871a4f2fa11f4ad4080a1bce.tar.gz rockbox-54a0aeff5b2f086b871a4f2fa11f4ad4080a1bce.zip |
fix accidental reverts in r20651
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20656 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/pictureflow.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c index ea6ebd24b0..51328b7072 100644 --- a/apps/plugins/pictureflow.c +++ b/apps/plugins/pictureflow.c | |||
@@ -130,7 +130,7 @@ const struct button_mapping pf_context_buttons[] = | |||
130 | {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY}, | 130 | {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY}, |
131 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 131 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
132 | {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, | 132 | {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, |
133 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD | 133 | #elif CONFIG_KEYPAD == MEIZU_X6SL_PAD |
134 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | 134 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
135 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ | 135 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ |
136 | CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD | 136 | CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD |
@@ -937,6 +937,7 @@ bool create_albumart_cache(void) | |||
937 | rb->splash(HZ, "Could not write bmp"); | 937 | rb->splash(HZ, "Could not write bmp"); |
938 | } | 938 | } |
939 | slides++; | 939 | slides++; |
940 | if ( rb->button_get(false) == PF_MENU ) return false; | ||
940 | } | 941 | } |
941 | if ( slides == 0 ) { | 942 | if ( slides == 0 ) { |
942 | /* Warn the user that we couldn't find any albumart */ | 943 | /* Warn the user that we couldn't find any albumart */ |
@@ -1716,16 +1717,6 @@ void show_next_slide(void) | |||
1716 | 1717 | ||
1717 | 1718 | ||
1718 | /** | 1719 | /** |
1719 | Return true if the rect has size 0 | ||
1720 | */ | ||
1721 | static inline bool is_empty_rect(struct rect *r) | ||
1722 | { | ||
1723 | return ((r->left == 0) && (r->right == 0) && (r->top == 0) | ||
1724 | && (r->bottom == 0)); | ||
1725 | } | ||
1726 | |||
1727 | |||
1728 | /** | ||
1729 | Render the slides. Updates only the offscreen buffer. | 1720 | Render the slides. Updates only the offscreen buffer. |
1730 | */ | 1721 | */ |
1731 | void render_all_slides(void) | 1722 | void render_all_slides(void) |
@@ -2097,8 +2088,12 @@ static inline void draw_gradient(int y, int h) | |||
2097 | selected_track_pulse = (selected_track_pulse+1) % 10; | 2088 | selected_track_pulse = (selected_track_pulse+1) % 10; |
2098 | int c2 = selected_track_pulse - 5; | 2089 | int c2 = selected_track_pulse - 5; |
2099 | for (r=0; r<h; r++) { | 2090 | for (r=0; r<h; r++) { |
2091 | #ifdef HAVE_LCD_COLOR | ||
2100 | MYLCD(set_foreground)(G_PIX(c2+80-(c >> 9), c2+100-(c >> 9), | 2092 | MYLCD(set_foreground)(G_PIX(c2+80-(c >> 9), c2+100-(c >> 9), |
2101 | c2+250-(c >> 8))); | 2093 | c2+250-(c >> 8))); |
2094 | #else | ||
2095 | MYLCD(set_foreground)(G_BRIGHT(c2+160-(c >> 8))); | ||
2096 | #endif | ||
2102 | MYLCD(hline)(0, LCD_WIDTH, r+y); | 2097 | MYLCD(hline)(0, LCD_WIDTH, r+y); |
2103 | if ( r > h/2 ) | 2098 | if ( r > h/2 ) |
2104 | c-=inc; | 2099 | c-=inc; |