diff options
| author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-01-15 11:21:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 11:21:54 +0100 |
| commit | 6d50be18dbe310c0665ef7179929420408856841 (patch) | |
| tree | e230873968f00a137bd2d9ad69b0bed41f9d2b91 | |
| parent | 3cad182e4120b9bc5ba8d3f05c1362b00cc552c1 (diff) | |
| parent | 71fdc65c5be89e2450c55fc0f227eaf3d3aec4dc (diff) | |
| download | AntennaPod-6d50be18dbe310c0665ef7179929420408856841.zip | |
Merge pull request #2987 from ByteHamster/audio-settings-dialog
Hiding settings that ExoPlayer does not yet support
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 7 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 1 |
2 files changed, 7 insertions, 1 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 51e498036..98dfeebef 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -534,11 +534,16 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements stereoToMono.setText(stereoToMono.getText() + " [" + sonicOnly + "]"); } + if (UserPreferences.useExoplayer()) { + barRightVolume.setEnabled(false); + } + final CheckBox skipSilence = (CheckBox) dialog.findViewById(R.id.skipSilence); skipSilence.setChecked(UserPreferences.isSkipSilence()); if (!UserPreferences.useExoplayer()) { skipSilence.setEnabled(false); - skipSilence.setText(skipSilence.getText() + "[ ExoPlayer only ]"); + String exoplayerOnly = getString(R.string.exoplayer_only); + skipSilence.setText(skipSilence.getText() + " [" + exoplayerOnly + "]"); } skipSilence.setOnCheckedChangeListener((buttonView, isChecked) -> { UserPreferences.setSkipSilence(isChecked); diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 68aa602ab..74c7644bf 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -692,6 +692,7 @@ <string name="audio_effects">Audio Effects</string> <string name="stereo_to_mono">Downmix: Stereo to mono</string> <string name="sonic_only">Sonic only</string> + <string name="exoplayer_only">ExoPlayer only</string> <!-- proxy settings --> <string name="proxy_type_label">Type</string> |