norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Cache the covers retrieved with getCover

Browse Source
This commit is contained in:
Christopher Eby 2010-07-01 00:28:01 -05:00
parent 435de332b8
commit f6298a07c3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/kreed/vanilla/CoverBitmap.java
View File

@ -162,11 +162,8 @@ public final class CoverBitmap {
Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
Canvas canvas = new Canvas(bitmap);
if (cover != null) {
if (cover != null)
canvas.drawBitmap(cover, null, new Rect(0, 0, width, height), paint);
cover.recycle();
cover = null;
}
int left = 0;
int top = height - boxHeight;
@ -269,8 +266,6 @@ public final class CoverBitmap {
if (cover != null) {
Rect rect = new Rect(0, 0, bitmapWidth, bitmapHeight);
canvas.drawBitmap(cover, null, rect, paint);
cover.recycle();
cover = null;
}
int left = (bitmapWidth - boxWidth) / 2;
@ -386,8 +381,6 @@ public final class CoverBitmap {
if (cover != null) {
RectF rect = new RectF(0, 0, coverWidth, coverHeight);
canvas.drawBitmap(cover, null, rect, paint);
cover.recycle();
cover = null;
}
int top;

18
src/org/kreed/vanilla/Song.java
View File

@ -45,6 +45,11 @@ public class Song implements Parcelable {
*/
public static final int FLAG_RANDOM = 0x1;
/**
* A cache of covers that have been loaded with getCover().
*/
private static final Cache<Bitmap> mCoverCache = new Cache<Bitmap>(10);
private static final String[] FILLED_PROJECTION = {
MediaStore.Audio.Media._ID,
MediaStore.Audio.Media.DATA,
@ -247,12 +252,15 @@ public class Song implements Parcelable {
if (id == -1)
return null;
// Query the cache for the cover
Bitmap cover = mCoverCache.get(id);
if (cover != null)
return cover;
Context context = ContextApplication.getContext();
ContentResolver res = context.getContentResolver();
Bitmap cover;
// Query the MediaStore content provider first
// Query the MediaStore content provider
cover = getCoverFromMediaFile(res);
// If that fails, try using MediaScanner directly
@ -263,6 +271,10 @@ public class Song implements Parcelable {
if (cover == null)
cover = getCoverFromMediaStoreCache(res);
Bitmap deletedCover = mCoverCache.put(id, cover);
if (deletedCover != null)
deletedCover.recycle();
return cover;
}