From ba8fbb0b9bb8db9f654b0120809e343516c02531 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 25 Sep 2009 18:36:28 +0000 Subject: Rename struct skin_albumart members to be consistent with similar members of other structs. the albumart_ prefix is redundant. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22836 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/albumart.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'apps/recorder/albumart.c') diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c index 7715287d46..bb2fae4af7 100644 --- a/apps/recorder/albumart.c +++ b/apps/recorder/albumart.c @@ -323,33 +323,33 @@ void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear) if (bufgetdata(handle_id, 0, (void *)&bmp) <= 0) return; - short x = aa->albumart_x; - short y = aa->albumart_y; + short x = aa->x; + short y = aa->y; short width = bmp->width; short height = bmp->height; - if (aa->albumart_max_width > 0) + if (aa->width > 0) { /* Crop if the bitmap is too wide */ - width = MIN(bmp->width, aa->albumart_max_width); + width = MIN(bmp->width, aa->width); /* Align */ - if (aa->albumart_xalign & WPS_ALBUMART_ALIGN_RIGHT) - x += aa->albumart_max_width - width; - else if (aa->albumart_xalign & WPS_ALBUMART_ALIGN_CENTER) - x += (aa->albumart_max_width - width) / 2; + if (aa->xalign & WPS_ALBUMART_ALIGN_RIGHT) + x += aa->width - width; + else if (aa->xalign & WPS_ALBUMART_ALIGN_CENTER) + x += (aa->width - width) / 2; } - if (aa->albumart_max_height > 0) + if (aa->height > 0) { /* Crop if the bitmap is too high */ - height = MIN(bmp->height, aa->albumart_max_height); + height = MIN(bmp->height, aa->height); /* Align */ - if (aa->albumart_yalign & WPS_ALBUMART_ALIGN_BOTTOM) - y += aa->albumart_max_height - height; - else if (aa->albumart_yalign & WPS_ALBUMART_ALIGN_CENTER) - y += (aa->albumart_max_height - height) / 2; + if (aa->yalign & WPS_ALBUMART_ALIGN_BOTTOM) + y += aa->height - height; + else if (aa->yalign & WPS_ALBUMART_ALIGN_CENTER) + y += (aa->height - height) / 2; } if (!clear) -- cgit v1.2.3