From be995f0b274c98efa286121b25cfbcf69fa15af7 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Tue, 26 Jun 2018 03:34:19 -0700 Subject: [PATCH] Rename HlsPlaylistTracker's release to stop ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202103550 --- .../exoplayer2/source/hls/HlsMediaSource.java | 2 +- .../hls/playlist/DefaultHlsPlaylistTracker.java | 2 +- .../source/hls/playlist/HlsPlaylistTracker.java | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index e0c805e1af..aa57ca24f5 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -401,7 +401,7 @@ public final class HlsMediaSource extends BaseMediaSource @Override public void releaseSourceInternal() { if (playlistTracker != null) { - playlistTracker.release(); + playlistTracker.stop(); } } diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java index 014a302de7..7266184750 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java @@ -105,7 +105,7 @@ public final class DefaultHlsPlaylistTracker } @Override - public void release() { + public void stop() { primaryHlsUrl = null; primaryUrlSnapshot = null; masterPlaylist = null; diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java index febd1c217d..01dce9fcd3 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java @@ -100,8 +100,8 @@ public interface HlsPlaylistTracker { /** * Starts the playlist tracker. * - *

Must be called from the playback thread. A tracker may be restarted after a {@link - * #release()} call. + *

Must be called from the playback thread. A tracker may be restarted after a {@link #stop()} + * call. * * @param initialPlaylistUri Uri of the HLS stream. Can point to a media playlist or a master * playlist. @@ -111,8 +111,12 @@ public interface HlsPlaylistTracker { void start( Uri initialPlaylistUri, EventDispatcher eventDispatcher, PrimaryPlaylistListener listener); - /** Releases all acquired resources. Must be called once per {@link #start} call. */ - void release(); + /** + * Stops the playlist tracker and releases any acquired resources. + * + *

Must be called once per {@link #start} call. + */ + void stop(); /** * Registers a listener to receive events from the playlist tracker.