diff options
author | ByteHamster <info@bytehamster.com> | 2020-03-26 21:47:19 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2020-03-26 21:47:19 +0100 |
commit | 75d44b95a2bbfac277462ebb463deaadb856ca85 (patch) | |
tree | 3cbb8a18f82a218c2576ab27cc5fa30b1e8bfb7d /app/src/main/java/de/danoeh/antennapod/activity | |
parent | 38c1b559e3d3a7714a4fd0b1fe41ed94a1bcd526 (diff) | |
download | AntennaPod-75d44b95a2bbfac277462ebb463deaadb856ca85.zip |
Removed unused code from PlaybackController
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 33 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java | 6 |
2 files changed, 14 insertions, 25 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 55aadc60b..9a4a5ef3a 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -93,7 +93,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements private Disposable disposable; private PlaybackController newPlaybackController() { - return new PlaybackController(this, false) { + return new PlaybackController(this) { @Override public void setupGUI() { @@ -151,11 +151,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements } @Override - public void onServiceQueried() { - MediaplayerActivity.this.onServiceQueried(); - } - - @Override public void onShutdownNotification() { finish(); } @@ -197,10 +192,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements updatePlaybackSpeedButtonText(); } - private void onServiceQueried() { - supportInvalidateOptionsMenu(); - } - void chooseTheme() { setTheme(UserPreferences.getTheme()); } @@ -648,31 +639,33 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements private float prog; @Override - public void onProgressChanged(SeekBar seekBar,int progress, boolean fromUser) { + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { if (controller == null || txtvLength == null) { return; } - prog = controller.onSeekBarProgressChanged(seekBar, progress, fromUser, txtvPosition); - if (showTimeLeft && prog != 0) { + if (fromUser) { + prog = progress / ((float) seekBar.getMax()); int duration = controller.getDuration(); TimeSpeedConverter converter = new TimeSpeedConverter(controller.getCurrentPlaybackSpeedMultiplier()); - int timeLeft = converter.convert(duration - (int) (prog * duration)); - String length = "-" + Converter.getDurationStringLong(timeLeft); - txtvLength.setText(length); + int position = converter.convert((int) (prog * duration)); + txtvPosition.setText(Converter.getDurationStringLong(position)); + + if (showTimeLeft) { + int timeLeft = converter.convert(duration - (int) (prog * duration)); + txtvLength.setText("-" + Converter.getDurationStringLong(timeLeft)); + } } } @Override public void onStartTrackingTouch(SeekBar seekBar) { - if (controller != null) { - controller.onSeekBarStartTrackingTouch(seekBar); - } + } @Override public void onStopTrackingTouch(SeekBar seekBar) { if (controller != null) { - controller.onSeekBarStopTrackingTouch(seekBar, prog); + controller.seekTo((int) (prog * controller.getDuration())); } } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index 212cb2f75..cb79a9265 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -247,11 +247,7 @@ public class VideoplayerActivity extends MediaplayerActivity { Log.d(TAG, "Videoview holder created"); videoSurfaceCreated = true; if (controller != null && controller.getStatus() == PlayerStatus.PLAYING) { - if (controller.serviceAvailable()) { - controller.setVideoSurface(holder); - } else { - Log.e(TAG, "Couldn't attach surface to mediaplayer - reference to service was null"); - } + controller.setVideoSurface(holder); } setupVideoAspectRatio(); } |