loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Remove deprecated message sending functionality

Browse Source 
PiperOrigin-RevId: 255379393
This commit is contained in:
olly 2019-06-27 13:14:00 +01:00 committed by Oliver Woodman
parent c974f74b1f
commit 2a366e76b7
4 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
View File

@ -117,30 +117,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
*/
public interface ExoPlayer extends Player {
/** @deprecated Use {@link PlayerMessage.Target} instead. */
@Deprecated
interface ExoPlayerComponent extends PlayerMessage.Target {}
/** @deprecated Use {@link PlayerMessage} instead. */
@Deprecated
final class ExoPlayerMessage {
/** The target to receive the message. */
public final PlayerMessage.Target target;
/** The type of the message. */
public final int messageType;
/** The message. */
public final Object message;
/** @deprecated Use {@link ExoPlayer#createMessage(PlayerMessage.Target)} instead. */
@Deprecated
public ExoPlayerMessage(PlayerMessage.Target target, int messageType, Object message) {
this.target = target;
this.messageType = messageType;
this.message = message;
}
}
/** Returns the {@link Looper} associated with the playback thread. */
Looper getPlaybackLooper();
@ -181,19 +157,6 @@ public interface ExoPlayer extends Player {
*/
PlayerMessage createMessage(PlayerMessage.Target target);
/** @deprecated Use {@link #createMessage(PlayerMessage.Target)} instead. */
@Deprecated
@SuppressWarnings("deprecation")
void sendMessages(ExoPlayerMessage... messages);
/**
* @deprecated Use {@link #createMessage(PlayerMessage.Target)} with {@link
* PlayerMessage#blockUntilDelivered()}.
*/
@Deprecated
@SuppressWarnings("deprecation")
void blockingSendMessages(ExoPlayerMessage... messages);
/**
* Sets the parameters that control how seek operations are performed.
*

41
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View File

@ -35,8 +35,6 @@ import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
@ -410,15 +408,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
/* playbackState= */ Player.STATE_IDLE);
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void sendMessages(ExoPlayerMessage... messages) {
for (ExoPlayerMessage message : messages) {
createMessage(message.target).setType(message.messageType).setPayload(message.message).send();
}
}
@Override
public PlayerMessage createMessage(Target target) {
return new PlayerMessage(
@ -429,36 +418,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
internalPlayerHandler);
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void blockingSendMessages(ExoPlayerMessage... messages) {
List<PlayerMessage> playerMessages = new ArrayList<>();
for (ExoPlayerMessage message : messages) {
playerMessages.add(
createMessage(message.target)
.setType(message.messageType)
.setPayload(message.message)
.send());
}
boolean wasInterrupted = false;
for (PlayerMessage message : playerMessages) {
boolean blockMessage = true;
while (blockMessage) {
try {
message.blockUntilDelivered();
blockMessage = false;
} catch (InterruptedException e) {
wasInterrupted = true;
}
}
}
if (wasInterrupted) {
// Restore the interrupted status.
Thread.currentThread().interrupt();
}
}
@Override
public int getCurrentPeriodIndex() {
if (shouldMaskPosition()) {

14
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View File

@ -1034,26 +1034,12 @@ public class SimpleExoPlayer extends BasePlayer
currentCues = Collections.emptyList();
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void sendMessages(ExoPlayerMessage... messages) {
player.sendMessages(messages);
}
@Override
public PlayerMessage createMessage(PlayerMessage.Target target) {
verifyApplicationThread();
return player.createMessage(target);
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void blockingSendMessages(ExoPlayerMessage... messages) {
player.blockingSendMessages(messages);
}
@Override
public int getRendererCount() {
verifyApplicationThread();

14
testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
View File

@ -175,20 +175,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
throw new UnsupportedOperationException();
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void sendMessages(ExoPlayerMessage... messages) {
throw new UnsupportedOperationException();
}
@Override
@Deprecated
@SuppressWarnings("deprecation")
public void blockingSendMessages(ExoPlayerMessage... messages) {
throw new UnsupportedOperationException();
}
@Override
public int getRendererCount() {
throw new UnsupportedOperationException();