summaryrefslogtreecommitdiff
path: root/playback
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2022-11-01 11:31:09 +0100
committerByteHamster <info@bytehamster.com>2022-11-01 12:06:13 +0100
commita29041cd4d797bf4737d6a0814ce4bb7c6420d01 (patch)
treeba520b3c2cd15854c01d5363c47adceb59284914 /playback
parent17f2ebd7f24f454d55056f16e3b2b0a0f6fbcf74 (diff)
downloadAntennaPod-a29041cd4d797bf4737d6a0814ce4bb7c6420d01.zip
No need to define INVALID_TIME multiple times
Diffstat (limited to 'playback')
-rw-r--r--playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java9
-rw-r--r--playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java12
2 files changed, 8 insertions, 13 deletions
diff --git a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
index a2ccb3f88..a5b6df41e 100644
--- a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
+++ b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
@@ -28,11 +28,6 @@ import de.danoeh.antennapod.model.playback.Playable;
public abstract class PlaybackServiceMediaPlayer {
private static final String TAG = "PlaybackSvcMediaPlayer";
- /**
- * Return value of some PSMP methods if the method call failed.
- */
- public static final int INVALID_TIME = -1;
-
private volatile PlayerStatus oldPlayerStatus;
protected volatile PlayerStatus playerStatus;
@@ -307,7 +302,7 @@ public abstract class PlaybackServiceMediaPlayer {
* @param newStatus The new PlayerStatus. This must not be null.
* @param newMedia The new playable object of the PSMP object. This can be null.
* @param position The position to be set to the current Playable object in case playback started or paused.
- * Will be ignored if given the value of {@link #INVALID_TIME}.
+ * Will be ignored if given the value of {@link Playable#INVALID_TIME}.
*/
protected final synchronized void setPlayerStatus(@NonNull PlayerStatus newStatus,
Playable newMedia, int position) {
@@ -337,7 +332,7 @@ public abstract class PlaybackServiceMediaPlayer {
* @see #setPlayerStatus(PlayerStatus, Playable, int)
*/
protected final void setPlayerStatus(@NonNull PlayerStatus newStatus, Playable newMedia) {
- setPlayerStatus(newStatus, newMedia, INVALID_TIME);
+ setPlayerStatus(newStatus, newMedia, Playable.INVALID_TIME);
}
public interface PSMPCallback {
diff --git a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
index d3c4f3468..0858d4fc9 100644
--- a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
+++ b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
@@ -173,7 +173,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
if (mediaChanged && stateChanged && oldState == MediaStatus.PLAYER_STATE_PLAYING
&& state != MediaStatus.PLAYER_STATE_IDLE) {
- callback.onPlaybackPause(null, INVALID_TIME);
+ callback.onPlaybackPause(null, Playable.INVALID_TIME);
// We don't want setPlayerStatus to handle the onPlaybackPause callback
setPlayerStatus(PlayerStatus.INDETERMINATE, currentMedia);
}
@@ -197,7 +197,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
case MediaStatus.PLAYER_STATE_BUFFERING:
setPlayerStatus((mediaChanged || playerStatus == PlayerStatus.PREPARING)
? PlayerStatus.PREPARING : PlayerStatus.SEEKING, currentMedia,
- currentMedia != null ? currentMedia.getPosition() : INVALID_TIME);
+ currentMedia != null ? currentMedia.getPosition() : Playable.INVALID_TIME);
break;
case MediaStatus.PLAYER_STATE_IDLE:
int reason = status.getIdleReason();
@@ -218,7 +218,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
// Means that a request to load a different media was sent
// Not sure if currentMedia already reflects the to be loaded one
if (mediaChanged && oldState == MediaStatus.PLAYER_STATE_PLAYING) {
- callback.onPlaybackPause(null, INVALID_TIME);
+ callback.onPlaybackPause(null, Playable.INVALID_TIME);
setPlayerStatus(PlayerStatus.INDETERMINATE, currentMedia);
}
setPlayerStatus(PlayerStatus.PREPARING, currentMedia);
@@ -376,7 +376,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
@Override
public void seekDelta(int d) {
int position = getPosition();
- if (position != INVALID_TIME) {
+ if (position != Playable.INVALID_TIME) {
seekTo(position + d);
} else {
Log.e(TAG, "getPosition() returned INVALID_TIME in seekDelta");
@@ -386,7 +386,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
@Override
public int getDuration() {
int retVal = (int) remoteMediaClient.getStreamDuration();
- if (retVal == INVALID_TIME && media != null && media.getDuration() > 0) {
+ if (retVal == Playable.INVALID_TIME && media != null && media.getDuration() > 0) {
retVal = media.getDuration();
}
return retVal;
@@ -542,7 +542,7 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
}
} else if (isPlaying) {
callback.onPlaybackPause(currentMedia,
- currentMedia != null ? currentMedia.getPosition() : INVALID_TIME);
+ currentMedia != null ? currentMedia.getPosition() : Playable.INVALID_TIME);
}
FutureTask<?> future = new FutureTask<>(() -> { }, null);