From 317641bc3027177e2a4f747f8277aa933d458565 Mon Sep 17 00:00:00 2001
From: Ub1Catcrush <41448998+Ub1Catcrush@users.noreply.github.com>
Date: Sat, 21 Jul 2018 17:53:20 +0200
Subject: [PATCH] A patch to add support for covers stored in the media files
ID3Tag. (#796)
* A patch to add support for covers stored in the media files IDTag.
* implement some suggested changes
* implement review comments
---
.../android/vanilla/CoverCache.java | 17 +++++++++++++++++
.../android/vanilla/PlaybackService.java | 1 +
.../android/vanilla/PrefDefaults.java | 1 +
.../blinkenlights/android/vanilla/PrefKeys.java | 1 +
app/src/main/res/values/translatable.xml | 3 +++
app/src/main/res/xml/preference_coverart.xml | 6 ++++++
6 files changed, 29 insertions(+)
diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/CoverCache.java b/app/src/main/java/ch/blinkenlights/android/vanilla/CoverCache.java
index d439a6b9..143108ce 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/CoverCache.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/CoverCache.java
@@ -27,6 +27,7 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
+import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.Environment;
import android.util.Log;
@@ -66,6 +67,10 @@ public class CoverCache {
* Use vanilla musics SHADOW cover load mechanism
*/
public static final int COVER_MODE_SHADOW = 0x4;
+ /**
+ * Use vanilla musics INLINE cover load mechanism
+ */
+ public static final int COVER_MODE_INLINE = 0x8;
/**
* Shared on-disk cache class
*/
@@ -463,6 +468,18 @@ public class CoverCache {
}
}
+ if (inputStream == null && (CoverCache.mCoverLoadMode & CoverCache.COVER_MODE_INLINE) != 0) {
+ MediaMetadataRetriever mmr = new MediaMetadataRetriever();
+ mmr.setDataSource(song.path);
+
+ byte[] data = mmr.getEmbeddedPicture();
+ if (data != null) {
+ sampleInputStream = new ByteArrayInputStream(data);
+ inputStream = new ByteArrayInputStream(data);
+ }
+ mmr.release();
+ }
+
if (inputStream != null) {
BitmapFactory.Options bopts = new BitmapFactory.Options();
bopts.inPreferredConfig = Bitmap.Config.RGB_565;
diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaybackService.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaybackService.java
index b126d546..3f5100ba 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -471,6 +471,7 @@ public final class PlaybackService extends Service
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_ANDROID, PrefDefaults.COVERLOADER_ANDROID) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_ANDROID : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_ANDROID);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_VANILLA, PrefDefaults.COVERLOADER_VANILLA) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_VANILLA : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_VANILLA);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_SHADOW , PrefDefaults.COVERLOADER_SHADOW) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_SHADOW : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_SHADOW);
+ CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_INLINE , PrefDefaults.COVERLOADER_INLINE) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_INLINE : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_INLINE);
mHeadsetOnly = settings.getBoolean(PrefKeys.HEADSET_ONLY, PrefDefaults.HEADSET_ONLY);
mStockBroadcast = settings.getBoolean(PrefKeys.STOCK_BROADCAST, PrefDefaults.STOCK_BROADCAST);
diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PrefDefaults.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PrefDefaults.java
index 6bd82ab0..b5fa4bd4 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/PrefDefaults.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PrefDefaults.java
@@ -33,6 +33,7 @@ public class PrefDefaults {
public static final boolean COVERLOADER_ANDROID = true;
public static final boolean COVERLOADER_VANILLA = true;
public static final boolean COVERLOADER_SHADOW = true;
+ public static final boolean COVERLOADER_INLINE = true;
public static final boolean COVER_ON_LOCKSCREEN = true;
public static final boolean DISABLE_LOCKSCREEN = false;
public static final String DISPLAY_MODE = "2";
diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PrefKeys.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PrefKeys.java
index 7ee2e9ab..b149e502 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/PrefKeys.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PrefKeys.java
@@ -34,6 +34,7 @@ public class PrefKeys {
public static final String COVERLOADER_ANDROID = "coverloader_android";
public static final String COVERLOADER_VANILLA = "coverloader_vanilla";
public static final String COVERLOADER_SHADOW = "coverloader_shadow";
+ public static final String COVERLOADER_INLINE = "coverloader_inline";
public static final String COVER_ON_LOCKSCREEN = "cover_on_lockscreen";
public static final String DISABLE_LOCKSCREEN = "disable_lockscreen";
public static final String DISPLAY_MODE = "display_mode";
diff --git a/app/src/main/res/values/translatable.xml b/app/src/main/res/values/translatable.xml
index 9c93afdd..90bd3b07 100644
--- a/app/src/main/res/values/translatable.xml
+++ b/app/src/main/res/values/translatable.xml
@@ -258,6 +258,9 @@ THE SOFTWARE.
Load artwork from hidden folder
Try to load artwork from \'/sdcard/Music/.vanilla/ARTIST/ALBUM.jpg\'
+ Load artwork from file tags
+ Try to load embedded artwork from file tags
+
Show artwork on lockscreen
Display the artwork of the currently playing track on the lockscreen
diff --git a/app/src/main/res/xml/preference_coverart.xml b/app/src/main/res/xml/preference_coverart.xml
index 4923d5ec..cdcf06a7 100644
--- a/app/src/main/res/xml/preference_coverart.xml
+++ b/app/src/main/res/xml/preference_coverart.xml
@@ -40,6 +40,12 @@ THE SOFTWARE.
android:title="@string/coverloader_android_title"
android:summary="@string/coverloader_android_summary"
android:defaultValue="true" />
+
+