summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-05-20 15:27:17 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-05-20 15:27:17 +0000
commitf531adc3121704d3c3a8ce4b580551aa8691236c (patch)
tree4435b96d9d5998641a92955caf6df37c73faeeb0
parentb8176a6761ff0e6f681c3a1ffb6351b40b24cd20 (diff)
downloadrockbox-f531adc3121704d3c3a8ce4b580551aa8691236c.tar.gz
rockbox-f531adc3121704d3c3a8ce4b580551aa8691236c.zip
pass pointers around instead of coping whole structs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26197 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/scrollbar.c12
-rw-r--r--apps/gui/scrollbar.h2
-rw-r--r--apps/gui/skin_engine/skin_display.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 67bf60de3f..317c55cdc7 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -170,7 +170,7 @@ void gui_scrollbar_draw(struct screen * screen, int x, int y,
170 screen->fillrect(inner_x, inner_y, inner_wd, inner_ht); 170 screen->fillrect(inner_x, inner_y, inner_wd, inner_ht);
171} 171}
172 172
173void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x, int y, 173void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, int x, int y,
174 int width, int height, int items, 174 int width, int height, int items,
175 int min_shown, int max_shown, 175 int min_shown, int max_shown,
176 unsigned flags) 176 unsigned flags)
@@ -202,15 +202,15 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x,
202 } 202 }
203 203
204#if LCD_DEPTH > 1 204#if LCD_DEPTH > 1
205 if (bm.format == FORMAT_MONO) 205 if (bm->format == FORMAT_MONO)
206#endif 206#endif
207 screen->mono_bitmap_part(bm.data, 0, 0, 207 screen->mono_bitmap_part(bm->data, 0, 0,
208 bm.width, x, y, width, height); 208 bm->width, x, y, width, height);
209#if LCD_DEPTH > 1 209#if LCD_DEPTH > 1
210 else 210 else
211 screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0, 211 screen->transparent_bitmap_part((fb_data *)bm->data, 0, 0,
212 STRIDE(screen->screen_type, 212 STRIDE(screen->screen_type,
213 bm.width, bm.height), 213 bm->width, bm->height),
214 x, y, width, height); 214 x, y, width, height);
215#endif 215#endif
216} 216}
diff --git a/apps/gui/scrollbar.h b/apps/gui/scrollbar.h
index 3c5b35eee9..03e1e6ec43 100644
--- a/apps/gui/scrollbar.h
+++ b/apps/gui/scrollbar.h
@@ -53,7 +53,7 @@ extern void gui_scrollbar_draw(struct screen * screen, int x, int y,
53 int width, int height, int items, 53 int width, int height, int items,
54 int min_shown, int max_shown, 54 int min_shown, int max_shown,
55 unsigned flags); 55 unsigned flags);
56extern void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, 56extern void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm,
57 int x, int y, 57 int x, int y,
58 int width, int height, int items, 58 int width, int height, int items,
59 int min_shown, int max_shown, 59 int min_shown, int max_shown,
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index a687e84f1c..08f363d165 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -178,7 +178,7 @@ static void draw_progressbar(struct gui_wps *gwps,
178 } 178 }
179 179
180 if (pb->have_bitmap_pb) 180 if (pb->have_bitmap_pb)
181 gui_bitmap_scrollbar_draw(display, pb->bm, 181 gui_bitmap_scrollbar_draw(display, &pb->bm,
182 pb->x, y, pb->width, pb->bm.height, 182 pb->x, y, pb->width, pb->bm.height,
183 length, 0, elapsed, HORIZONTAL); 183 length, 0, elapsed, HORIZONTAL);
184 else 184 else