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

Use ArrayList instead of Vector

Browse Source
This commit is contained in:
Adrian Ulrich 2016-11-26 17:24:43 +01:00
parent 92cfa6f2ca
commit b24648caac
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ch/blinkenlights/android/vanilla/BastpUtil.java
View File

@ -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;
}

1
src/ch/blinkenlights/android/vanilla/MediaUtils.java
View File

@ -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;

10
src/ch/blinkenlights/bastp/Common.java
View File

@ -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<String>();
l.add(value);
tags.put(key, l);
}
}