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

Merge branch 'master' into medialibrary

Browse Source
This commit is contained in:
Adrian Ulrich 2016-11-26 17:25:04 +01:00
commit 80744ae9cc
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -23,8 +23,8 @@ THE SOFTWARE.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.blinkenlights.android.vanilla"
android:versionName="1.0.45"
android:versionCode="10450"
android:versionName="1.0.46"
android:versionCode="10460"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="24" />
<uses-permission android:name="android.permission.WAKE_LOCK" />

9
assets/about.html
View File

@ -20,7 +20,7 @@ function show(n) {
</head>
<body>
<h1>Vanilla Music</h1>
<p><b>Version:</b> 1.0.45 Released Oct. 25, 2016<br><br>
<p><b>Version:</b> 1.0.46 Released Nov. 25, 2016<br><br>
<b>Website:</b> <a href='http://vanillamusic.io'>http://vanillamusic.io</a><br>
<b>Issue tracker:</b> <a href='https://github.com/vanilla-music/vanilla/issues'>https://github.com/vanilla-music/vanilla/issues</a><br>
<b>Community &amp; support:</b> <a href='https://www.reddit.com/r/vanillamusic'>/r/VanillaMusic</a><br>
@ -28,6 +28,13 @@ function show(n) {
<br>
<b>Changelog</b> [<a href='javascript:show("changelog")'>show</a>]
<pre id='changelog'>
<b>1.0.46</b>
- <b>NEW</b> Replay gain support for m4a files
- <b>NEW</b> New and improved sorting options
- <b>FIX</b> Some performance improvements
- <b>FIX</b> Upgraded to Android 7 SDK
<b>1.0.45</b>
- <b>NEW</b> Enqueue selected folders alphabetically
- <b>FIX</b> Do not crash on Android 5.x while creating a Playlist

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

@ -31,7 +31,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 android.util.Log;

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