From 0eced38ea5cc5d00b6138ede3902fb6d33823966 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 6 Jun 2016 16:21:15 +0200 Subject: Android: fix media player volume. Qt expects a linear volume, so does Android. We don't need to do any conversion. Change-Id: I35acf0040aff0c6c0d812b4d11fe42a7a6a97ed0 Reviewed-by: Christian Stromme --- .../qt5/android/multimedia/QtAndroidMediaPlayer.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java index d0983d38a..6818b2909 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java +++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java @@ -449,17 +449,6 @@ public class QtAndroidMediaPlayer return duration; } - private float adjustVolume(final int volume) - { - if (volume < 1) - return 0.0f; - - if (volume > 98) - return 1.0f; - - return (float) (1-(Math.log(100-volume)/Math.log(100))); - } - public void setVolume(int volume) { if (volume < 0) @@ -487,7 +476,7 @@ public class QtAndroidMediaPlayer } try { - float newVolume = adjustVolume(volume); + float newVolume = (float)volume / 100; mMediaPlayer.setVolume(newVolume, newVolume); } catch (final IllegalStateException e) { Log.d(TAG, "" + e.getMessage()); -- cgit v1.2.3