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 <christian.stromme@qt.io>

1 files changed, 1 insertions, 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());