From 92cfa6f2ca3287ff8db5410e4ba54188729335a4 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Thu, 24 Nov 2016 15:22:24 +0100 Subject: [PATCH 1/2] target 1.0.46 --- AndroidManifest.xml | 4 ++-- assets/about.html | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aea73a6b..cde6360d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,8 +23,8 @@ THE SOFTWARE. --> diff --git a/assets/about.html b/assets/about.html index 92b517b8..2a6f2b14 100644 --- a/assets/about.html +++ b/assets/about.html @@ -20,7 +20,7 @@ function show(n) {

Vanilla Music

-

Version: 1.0.45 Released Oct. 25, 2016

+

Version: 1.0.46 Released Nov. 25, 2016

Website: http://vanillamusic.io
Issue tracker: https://github.com/vanilla-music/vanilla/issues
Community & support: /r/VanillaMusic
@@ -28,6 +28,13 @@ function show(n) {
Changelog [show] 

+
+1.0.46
+- NEW Replay gain support for m4a files
+- NEW New and improved sorting options
+- FIX Some performance improvements
+- FIX Upgraded to Android 7 SDK
+
 1.0.45
 - NEW Enqueue selected folders alphabetically
 - FIX Do not crash on Android 5.x while creating a Playlist

From b24648caac20382f94ca4266534a63187524ea0a Mon Sep 17 00:00:00 2001
From: Adrian Ulrich 
Date: Sat, 26 Nov 2016 17:24:43 +0100
Subject: [PATCH 2/2] Use ArrayList instead of Vector

---
 src/ch/blinkenlights/android/vanilla/BastpUtil.java  | 12 ++++++------
 src/ch/blinkenlights/android/vanilla/MediaUtils.java |  1 -
 src/ch/blinkenlights/bastp/Common.java               | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/ch/blinkenlights/android/vanilla/BastpUtil.java b/src/ch/blinkenlights/android/vanilla/BastpUtil.java
index 3b796f36..c3372c68 100644
--- a/src/ch/blinkenlights/android/vanilla/BastpUtil.java
+++ b/src/ch/blinkenlights/android/vanilla/BastpUtil.java
@@ -19,8 +19,8 @@ package ch.blinkenlights.android.vanilla;
 
 import android.util.LruCache;
 import ch.blinkenlights.bastp.Bastp;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Vector;
 
 public class BastpUtil {
 	/**
@@ -75,17 +75,17 @@ public class BastpUtil {
 
 		// normal replay gain, add 5dB difference
 		if(tags.containsKey("REPLAYGAIN_TRACK_GAIN"))
-			gv.track = getFloatFromString((String)((Vector)tags.get("REPLAYGAIN_TRACK_GAIN")).get(0));
+			gv.track = getFloatFromString((String)((ArrayList)tags.get("REPLAYGAIN_TRACK_GAIN")).get(0));
 		if(tags.containsKey("REPLAYGAIN_ALBUM_GAIN"))
-			gv.album = getFloatFromString((String)((Vector)tags.get("REPLAYGAIN_ALBUM_GAIN")).get(0));
+			gv.album = getFloatFromString((String)((ArrayList)tags.get("REPLAYGAIN_ALBUM_GAIN")).get(0));
 
 		// likely OPUS
 		if(tags.containsKey("R128_BASTP_BASE_GAIN"))
-			gv.base = 0.0f + getFloatFromString((String)((Vector)tags.get("R128_BASTP_BASE_GAIN")).get(0)) / 256.0f;
+			gv.base = 0.0f + getFloatFromString((String)((ArrayList)tags.get("R128_BASTP_BASE_GAIN")).get(0)) / 256.0f;
 		if(tags.containsKey("R128_TRACK_GAIN"))
-			gv.track = 5.0f + getFloatFromString((String)((Vector)tags.get("R128_TRACK_GAIN")).get(0)) / 256.0f;
+			gv.track = 5.0f + getFloatFromString((String)((ArrayList)tags.get("R128_TRACK_GAIN")).get(0)) / 256.0f;
 		if(tags.containsKey("R128_ALBUM_GAIN"))
-			gv.album = 5.0f + getFloatFromString((String)((Vector)tags.get("R128_ALBUM_GAIN")).get(0)) / 256.0f;
+			gv.album = 5.0f + getFloatFromString((String)((ArrayList)tags.get("R128_ALBUM_GAIN")).get(0)) / 256.0f;
 
 		return gv;
 	}
diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
index 0462c005..fd8d30e5 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Vector;
 import java.util.zip.CRC32;
 
 import junit.framework.Assert;
diff --git a/src/ch/blinkenlights/bastp/Common.java b/src/ch/blinkenlights/bastp/Common.java
index 90811a64..6db01908 100644
--- a/src/ch/blinkenlights/bastp/Common.java
+++ b/src/ch/blinkenlights/bastp/Common.java
@@ -21,7 +21,7 @@ package ch.blinkenlights.bastp;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.HashMap;
-import java.util.Vector;
+import java.util.ArrayList;
 
 public class Common {
 	private static final int MAX_COMMENT_SIZE = 512;
@@ -144,12 +144,12 @@ public class Common {
 
 	public void addTagEntry(HashMap tags, String key, String value) {
 		if(tags.containsKey(key)) {
-			((Vector)tags.get(key)).add(value); // just add to existing vector
+			((ArrayList)tags.get(key)).add(value); // just add to existing vector
 		}
 		else {
-			Vector vx = new Vector();
-			vx.add(value);
-			tags.put(key, vx);
+			ArrayList l = new ArrayList();
+			l.add(value);
+			tags.put(key, l);
 		}
 	}