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

never call setVolume with values > 1.0f

Browse Source
This commit is contained in:
Adrian Ulrich 2013-06-13 17:59:29 +02:00
parent 40d29f63fa
commit adfd112a3f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import android.util.LruCache;
import ch.blinkenlights.bastp.Bastp; import ch.blinkenlights.bastp.Bastp;
import java.util.HashMap; import java.util.HashMap;
import java.util.Vector; import java.util.Vector;
import android.util.Log;
public class BastpUtil { public class BastpUtil {
private RGLruCache rgCache; private RGLruCache rgCache;
@ -35,7 +34,7 @@ public class BastpUtil {
*/ */
public float[] getReplayGainValues(String path) { public float[] getReplayGainValues(String path) {
float[] cached = rgCache.get(path); float[] cached = rgCache.get(path);
Log.d("VanillaMusic", "LRU cache("+rgCache.size()+"): "+path+" -> "+cached);
if(cached == null) { if(cached == null) {
cached = getReplayGainValuesFromFile(path); cached = getReplayGainValuesFromFile(path);
rgCache.put(path, cached); rgCache.put(path, cached);

5
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -643,8 +643,11 @@ public final class PlaybackService extends Service
} }
float rg_result = (float)Math.pow(10, (adjust/20) ); float rg_result = (float)Math.pow(10, (adjust/20) );
if(rg_result > 1.0f) {
rg_result = 1.0f; /* android would IGNORE the change if this is > 1 and we would end up with the wrong volume */
}
mp.setVolume(rg_result, rg_result); mp.setVolume(rg_result, rg_result);
Log.d("VanillaMusic", "rg="+rg_result+", adj="+adjust+", pth="+path);
} }
public float[] getReplayGainValues(String path) { public float[] getReplayGainValues(String path) {