Skip to content

SDK / exoplayer

Go to a project
Commit 74faa3aa by bachinger Committed by Oliver Woodman
Options

rename setMediaItem to setMediaSource 

PiperOrigin-RevId: 284514142
parent 8b3c3ffb
Inline Side-by-side
Showing with 32 additions and 31 deletions
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -395,7 +395,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -395,7 +395,7 @@ public class PlayerActivity extends AppCompatActivity
if (haveStartPosition) { if (haveStartPosition) {
player.seekTo(startWindow, startPosition); player.seekTo(startWindow, startPosition);
} }
player.setMediaItem(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
updateButtonVisibility(); updateButtonVisibility();
} }
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
...@@ -358,12 +358,13 @@ public interface ExoPlayer extends Player { ...@@ -358,12 +358,13 @@ public interface ExoPlayer extends Player {
void prepare(); void prepare();
/** /**
* @deprecated Use {@code setMediaItem(mediaSource, C.TIME_UNSET)} and {@link #prepare()} instead. * @deprecated Use {@code setMediaSource(mediaSource, C.TIME_UNSET)} and {@link #prepare()}
* instead.
*/ */
@Deprecated @Deprecated
void prepare(MediaSource mediaSource); void prepare(MediaSource mediaSource);
/** @deprecated Use {@link #setMediaItem(MediaSource, long)} and {@link #prepare()} instead. */ /** @deprecated Use {@link #setMediaSource(MediaSource, long)} and {@link #prepare()} instead. */
@Deprecated @Deprecated
void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState); void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState);
...@@ -373,9 +374,9 @@ public interface ExoPlayer extends Player { ...@@ -373,9 +374,9 @@ public interface ExoPlayer extends Player {
* <p>Note: This is an intermediate implementation towards a larger change. Until then {@link * <p>Note: This is an intermediate implementation towards a larger change. Until then {@link
* #prepare()} has to be called immediately after calling this method. * #prepare()} has to be called immediately after calling this method.
* *
* @param mediaItem The new {@link MediaSource}. * @param mediaSource The new {@link MediaSource}.
*/ */
void setMediaItem(MediaSource mediaItem); void setMediaSource(MediaSource mediaSource);
/** /**
* Sets the specified {@link MediaSource}. * Sets the specified {@link MediaSource}.
...@@ -391,13 +392,13 @@ public interface ExoPlayer extends Player { ...@@ -391,13 +392,13 @@ public interface ExoPlayer extends Player {
* player.stop(true); * player.stop(true);
* } * }
* player.seekTo(0, startPositionMs); * player.seekTo(0, startPositionMs);
* player.setMediaItem(mediaItem); * player.setMediaSource(mediaSource);
* </code></pre> * </code></pre>
* *
* @param mediaItem The new {@link MediaSource}. * @param mediaSource The new {@link MediaSource}.
* @param startPositionMs The position in milliseconds to start playback from. * @param startPositionMs The position in milliseconds to start playback from.
*/ */
void setMediaItem(MediaSource mediaItem, long startPositionMs); void setMediaSource(MediaSource mediaSource, long startPositionMs);
/** /**
* Creates a message that can be sent to a {@link PlayerMessage.Target}. By default, the message * Creates a message that can be sent to a {@link PlayerMessage.Target}. By default, the message
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -236,14 +236,14 @@ import java.util.concurrent.TimeoutException; ...@@ -236,14 +236,14 @@ import java.util.concurrent.TimeoutException;
@Override @Override
@Deprecated @Deprecated
public void prepare(MediaSource mediaSource) { public void prepare(MediaSource mediaSource) {
setMediaItem(mediaSource); setMediaSource(mediaSource);
prepareInternal(/* resetPosition= */ true, /* resetState= */ true); prepareInternal(/* resetPosition= */ true, /* resetState= */ true);
} }
@Override @Override
@Deprecated @Deprecated
public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) { public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
setMediaItem(mediaSource); setMediaSource(mediaSource);
prepareInternal(resetPosition, resetState); prepareInternal(resetPosition, resetState);
} }
...@@ -254,17 +254,17 @@ import java.util.concurrent.TimeoutException; ...@@ -254,17 +254,17 @@ import java.util.concurrent.TimeoutException;
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem, long startPositionMs) { public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
if (!getCurrentTimeline().isEmpty()) { if (!getCurrentTimeline().isEmpty()) {
stop(/* reset= */ true); stop(/* reset= */ true);
} }
seekTo(/* windowIndex= */ 0, startPositionMs); seekTo(/* windowIndex= */ 0, startPositionMs);
setMediaItem(mediaItem); setMediaSource(mediaSource);
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem) { public void setMediaSource(MediaSource mediaSource) {
mediaSource = mediaItem; this.mediaSource = mediaSource;
} }
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -1185,7 +1185,7 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1185,7 +1185,7 @@ public class SimpleExoPlayer extends BasePlayer
@Deprecated @Deprecated
public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) { public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
verifyApplicationThread(); verifyApplicationThread();
setMediaItem(mediaSource); setMediaSource(mediaSource);
prepareInternal(resetPosition, resetState); prepareInternal(resetPosition, resetState);
} }
...@@ -1196,17 +1196,17 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1196,17 +1196,17 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem, long startPositionMs) { public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
verifyApplicationThread(); verifyApplicationThread();
setMediaItemInternal(mediaItem); setMediaSourceInternal(mediaSource);
player.setMediaItem(mediaItem, startPositionMs); player.setMediaSource(mediaSource, startPositionMs);
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem) { public void setMediaSource(MediaSource mediaSource) {
verifyApplicationThread(); verifyApplicationThread();
setMediaItemInternal(mediaItem); setMediaSourceInternal(mediaSource);
player.setMediaItem(mediaItem); player.setMediaSource(mediaSource);
} }
@Override @Override
...@@ -1463,13 +1463,13 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1463,13 +1463,13 @@ public class SimpleExoPlayer extends BasePlayer
player.prepareInternal(resetPosition, resetState); player.prepareInternal(resetPosition, resetState);
} }
private void setMediaItemInternal(MediaSource mediaItem) { private void setMediaSourceInternal(MediaSource mediaSource) {
if (mediaSource != null) { if (this.mediaSource != null) {
mediaSource.removeEventListener(analyticsCollector); this.mediaSource.removeEventListener(analyticsCollector);
analyticsCollector.resetForNewMediaSource(); analyticsCollector.resetForNewMediaSource();
} }
mediaSource = mediaItem; this.mediaSource = mediaSource;
mediaSource.addEventListener(eventHandler, analyticsCollector); this.mediaSource.addEventListener(eventHandler, analyticsCollector);
} }
private void removeSurfaceCallbacks() { private void removeSurfaceCallbacks() {
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -3062,7 +3062,7 @@ public final class ExoPlayerTest { ...@@ -3062,7 +3062,7 @@ public final class ExoPlayerTest {
new PlayerRunnable() { new PlayerRunnable() {
@Override @Override
public void run(SimpleExoPlayer player) { public void run(SimpleExoPlayer player) {
player.setMediaItem(mediaSource, /* startPositionMs= */ 5000); player.setMediaSource(mediaSource, /* startPositionMs= */ 5000);
player.prepare(); player.prepare();
} }
}) })
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
...@@ -141,7 +141,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { ...@@ -141,7 +141,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
pendingSchedule = null; pendingSchedule = null;
} }
DrmSessionManager<FrameworkMediaCrypto> drmSessionManager = buildDrmSessionManager(userAgent); DrmSessionManager<FrameworkMediaCrypto> drmSessionManager = buildDrmSessionManager(userAgent);
player.setMediaItem(buildSource(host, Util.getUserAgent(host, userAgent), drmSessionManager)); player.setMediaSource(buildSource(host, Util.getUserAgent(host, userAgent), drmSessionManager));
player.prepare(); player.prepare();
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
...@@ -447,7 +447,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc ...@@ -447,7 +447,7 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
if (actionSchedule != null) { if (actionSchedule != null) {
actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this); actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this);
} }
player.setMediaItem(mediaSource); player.setMediaSource(mediaSource);
player.prepare(); player.prepare();
} catch (Exception e) { } catch (Exception e) {
handleException(e); handleException(e);
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
...@@ -112,12 +112,12 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer { ...@@ -112,12 +112,12 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem) { public void setMediaSource(MediaSource mediaSource) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override @Override
public void setMediaItem(MediaSource mediaItem, long startPositionMs) { public void setMediaSource(MediaSource mediaSource, long startPositionMs) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment