diff options
| author | Domingos Lopes <domingos86lopes@gmail.com> | 2016-02-20 09:02:50 -0500 |
|---|---|---|
| committer | Domingos Lopes <domingos86lopes@gmail.com> | 2016-02-20 09:02:50 -0500 |
| commit | 13f5b09d56d5dd0e21a4e13f438e35ed3c7ebb19 (patch) | |
| tree | 3667823f66c1a41b258ccc6c26f8d169a6d994be /app/src/main/java/de | |
| parent | 844dd17cb195c6fd81d83f5ca560d65612a9cdcb (diff) | |
| download | AntennaPod-13f5b09d56d5dd0e21a4e13f438e35ed3c7ebb19.zip | |
fix the volume conversion upon user interaction
move the conversion formula to a new method in core.util.Converter
Diffstat (limited to 'app/src/main/java/de')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index e890f03b7..bad6bdf0a 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -493,14 +493,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O barLeftVolume.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - float leftVolume = 1.0f, rightVolume = 1.0f; - if (progress < 100) { - leftVolume = progress / 100.0f; - } - if (barRightVolume.getProgress() < 100) { - rightVolume = barRightVolume.getProgress() / 100.0f; - } - controller.setVolume(leftVolume, rightVolume); + controller.setVolume( + Converter.getVolumeFromPercentage(progress), + Converter.getVolumeFromPercentage(barRightVolume.getProgress())); } @Override @@ -514,14 +509,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O barRightVolume.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - float leftVolume = 1.0f, rightVolume = 1.0f; - if (progress < 100) { - rightVolume = progress / 100.0f; - } - if (barLeftVolume.getProgress() < 100) { - leftVolume = barLeftVolume.getProgress() / 100.0f; - } - controller.setVolume(leftVolume, rightVolume); + controller.setVolume( + Converter.getVolumeFromPercentage(barLeftVolume.getProgress()), + Converter.getVolumeFromPercentage(progress)); } @Override |