summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-03-16 10:20:32 +0000
committerThomas Martitz <kugel@rockbox.org>2011-03-16 10:20:32 +0000
commita0c664850c7524ce829b31c9ddb81fe9c6fd3d3a (patch)
tree4a8c2ee5826fafa5b23860d1a8f791a34ec6aa5f
parentccd53953b2102a1675d866f31dcc2a332b2dd9f2 (diff)
downloadrockbox-a0c664850c7524ce829b31c9ddb81fe9c6fd3d3a.tar.gz
rockbox-a0c664850c7524ce829b31c9ddb81fe9c6fd3d3a.zip
Fix FS#12012 - Radio Art broken since r29259 - Embedded album art support
Forgot to adapt radio art to the new bufopen user_data argument. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29598 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/radio/radioart.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/radio/radioart.c b/apps/radio/radioart.c
index 23fb7a33d5..5e501414ca 100644
--- a/apps/radio/radioart.c
+++ b/apps/radio/radioart.c
@@ -27,6 +27,7 @@
27#include "settings.h" 27#include "settings.h"
28#include "radio.h" 28#include "radio.h"
29#include "buffering.h" 29#include "buffering.h"
30#include "playback.h" /* bufopen_user_data */
30#include "file.h" 31#include "file.h"
31#include "kernel.h" 32#include "kernel.h"
32#include "string-extra.h" 33#include "string-extra.h"
@@ -63,6 +64,7 @@ static int load_radioart_image(struct radioart *ra, const char* preset_name,
63 struct dim *dim) 64 struct dim *dim)
64{ 65{
65 char path[MAX_PATH]; 66 char path[MAX_PATH];
67 struct bufopen_bitmap_data user_data;
66#ifndef HAVE_NOISY_IDLE_MODE 68#ifndef HAVE_NOISY_IDLE_MODE
67 cpu_idle_mode(false); 69 cpu_idle_mode(false);
68#endif 70#endif
@@ -80,7 +82,9 @@ static int load_radioart_image(struct radioart *ra, const char* preset_name,
80 ra->dim.height = dim->height; 82 ra->dim.height = dim->height;
81 ra->dim.width = dim->width; 83 ra->dim.width = dim->width;
82 ra->last_tick = current_tick; 84 ra->last_tick = current_tick;
83 ra->handle = bufopen(path, 0, TYPE_BITMAP, &ra->dim); 85 user_data.embedded_albumart = NULL;
86 user_data.dim = &ra->dim;
87 ra->handle = bufopen(path, 0, TYPE_BITMAP, &user_data);
84 if (ra->handle == ERR_BUFFER_FULL) 88 if (ra->handle == ERR_BUFFER_FULL)
85 { 89 {
86 int i = find_oldest_image(); 90 int i = find_oldest_image();