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

use own class as cache key

Browse Source
This commit is contained in:
Adrian Ulrich 2014-06-16 22:34:01 +02:00
parent ec0f0994bd
commit 04f29a1c30
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/ch/blinkenlights/android/vanilla/Song.java
View File

@ -33,6 +33,8 @@ import android.provider.MediaStore;
import android.util.LruCache; import android.util.LruCache;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import android.util.Log;
/** /**
* Represents a Song backed by the MediaStore. Includes basic metadata and * Represents a Song backed by the MediaStore. Includes basic metadata and
* utilities to retrieve songs from the MediaStore. * utilities to retrieve songs from the MediaStore.
@ -84,10 +86,39 @@ public class Song implements Comparable<Song> {
MediaStore.Audio.Playlists.Members.TRACK, MediaStore.Audio.Playlists.Members.TRACK,
}; };
private class LruCacheKey {
Long id;
String path;
public LruCacheKey(Long id, String path) {
this.id = id;
this.path = path;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof LruCacheKey && id.equals( ((LruCacheKey)obj).id )) {
return true;
}
return false;
}
@Override
public int hashCode() {
return this.path.length();
}
@Override
public String toString() {
return "LruCacheKey<"+this.id+"> = "+this.path;
}
}
/** /**
* A cache of 6 MiB of covers. * A cache of 6 MiB of covers.
*/ */
private static class CoverCache extends LruCache<Long, Bitmap> { private static class CoverCache extends LruCache<LruCacheKey, Bitmap> {
private final Context mContext; private final Context mContext;
public CoverCache(Context context) public CoverCache(Context context)
@ -97,11 +128,11 @@ public class Song implements Comparable<Song> {
} }
@Override @Override
public Bitmap create(Long key) public Bitmap create(LruCacheKey key)
{ {
Uri uri = Uri.parse("content://media/external/audio/media/" + key + "/albumart"); Uri uri = Uri.parse("content://media/external/audio/media/" + key.id + "/albumart");
ContentResolver res = mContext.getContentResolver(); ContentResolver res = mContext.getContentResolver();
Log.v("VanillaMusic", "Cache miss on key "+key);
try { try {
ParcelFileDescriptor parcelFileDescriptor = res.openFileDescriptor(uri, "r"); ParcelFileDescriptor parcelFileDescriptor = res.openFileDescriptor(uri, "r");
if (parcelFileDescriptor != null) { if (parcelFileDescriptor != null) {
@ -140,7 +171,7 @@ public class Song implements Comparable<Song> {
} }
@Override @Override
protected int sizeOf(Long key, Bitmap value) protected int sizeOf(LruCacheKey key, Bitmap value)
{ {
return value.getRowBytes() * value.getHeight(); return value.getRowBytes() * value.getHeight();
} }
@ -273,7 +304,9 @@ public class Song implements Comparable<Song> {
if (sCoverCache == null) if (sCoverCache == null)
sCoverCache = new CoverCache(context.getApplicationContext()); sCoverCache = new CoverCache(context.getApplicationContext());
Bitmap cover = sCoverCache.get(id); LruCacheKey key = new LruCacheKey(id, path);
Bitmap cover = sCoverCache.get(key);
if (cover == null) if (cover == null)
flags |= FLAG_NO_COVER; flags |= FLAG_NO_COVER;
return cover; return cover;