Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0eb02671
authored
Feb 10, 2020
by
bachinger
Committed by
kim-vde
Feb 11, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
deprecate and rename onLoadingChanged
PiperOrigin-RevId: 294222083
parent
5725acb7
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
8 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
library/core/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
RELEASENOTES.md
View file @
0eb02671
...
...
@@ -10,6 +10,7 @@
*
Add
`Player.onPlaybackStateChanged`
and deprecate
`Player.onPlayerStateChanged`
.
*
Deprecate and rename getPlaybackError to getPlayerError for consistency.
*
Deprecate and rename onLoadingChanged to onIsLoadingChanged for consistency.
*
Make
`MediaSourceEventListener.LoadEventInfo`
and
`MediaSourceEventListener.MediaLoadData`
top-level classes.
*
Rename
`MediaCodecRenderer.onOutputFormatChanged`
to
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View file @
0eb02671
...
...
@@ -1202,7 +1202,11 @@ import java.util.concurrent.TimeoutException;
playbackInfo
.
trackGroups
,
playbackInfo
.
trackSelectorResult
.
selections
));
}
if
(
isLoadingChanged
)
{
invokeAll
(
listenerSnapshot
,
listener
->
listener
.
onLoadingChanged
(
playbackInfo
.
isLoading
));
invokeAll
(
listenerSnapshot
,
listener
->
{
listener
.
onIsLoadingChanged
(
playbackInfo
.
isLoading
);
});
}
if
(
playbackStateChanged
)
{
invokeAll
(
...
...
library/core/src/main/java/com/google/android/exoplayer2/Player.java
View file @
0eb02671
...
...
@@ -407,6 +407,13 @@ public interface Player {
*
* @param isLoading Whether the source is currently being loaded.
*/
@SuppressWarnings
(
"deprecation"
)
default
void
onIsLoadingChanged
(
boolean
isLoading
)
{
onLoadingChanged
(
isLoading
);
}
/** @deprecated Use {@link #onIsLoadingChanged(boolean)} instead. */
@Deprecated
default
void
onLoadingChanged
(
boolean
isLoading
)
{}
/**
...
...
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View file @
0eb02671
...
...
@@ -1931,7 +1931,7 @@ public class SimpleExoPlayer extends BasePlayer
// Player.EventListener implementation.
@Override
public
void
onLoadingChanged
(
boolean
isLoading
)
{
public
void
on
Is
LoadingChanged
(
boolean
isLoading
)
{
if
(
priorityTaskManager
!=
null
)
{
if
(
isLoading
&&
!
isPriorityTaskManagerRegistered
)
{
priorityTaskManager
.
add
(
C
.
PRIORITY_PLAYBACK
);
...
...
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
View file @
0eb02671
...
...
@@ -431,10 +431,10 @@ public class AnalyticsCollector
}
@Override
public
final
void
onLoadingChanged
(
boolean
isLoading
)
{
public
final
void
on
Is
LoadingChanged
(
boolean
isLoading
)
{
EventTime
eventTime
=
generateCurrentPlayerMediaPeriodEventTime
();
for
(
AnalyticsListener
listener
:
listeners
)
{
listener
.
onLoadingChanged
(
eventTime
,
isLoading
);
listener
.
on
Is
LoadingChanged
(
eventTime
,
isLoading
);
}
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
View file @
0eb02671
...
...
@@ -227,6 +227,13 @@ public interface AnalyticsListener {
* @param eventTime The event time.
* @param isLoading Whether the player is loading.
*/
@SuppressWarnings
(
"deprecation"
)
default
void
onIsLoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{
onLoadingChanged
(
eventTime
,
isLoading
);
}
/** @deprecated Use {@link #onIsLoadingChanged(EventTime, boolean)} instead. */
@Deprecated
default
void
onLoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{}
/**
...
...
library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
View file @
0eb02671
...
...
@@ -91,7 +91,7 @@ public class EventLogger implements AnalyticsListener {
// AnalyticsListener
@Override
public
void
onLoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{
public
void
on
Is
LoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{
logd
(
eventTime
,
"loading"
,
Boolean
.
toString
(
isLoading
));
}
...
...
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
View file @
0eb02671
...
...
@@ -1393,7 +1393,7 @@ public final class AnalyticsCollectorTest {
}
@Override
public
void
onLoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{
public
void
on
Is
LoadingChanged
(
EventTime
eventTime
,
boolean
isLoading
)
{
reportedEvents
.
add
(
new
ReportedEvent
(
EVENT_LOADING_CHANGED
,
eventTime
));
}
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
View file @
0eb02671
...
...
@@ -984,7 +984,7 @@ public abstract class Action {
/**
* Waits for a specified loading state, returning either immediately or after a call to {@link
* Player.EventListener#onLoadingChanged(boolean)}.
* Player.EventListener#on
Is
LoadingChanged(boolean)}.
*/
public
static
final
class
WaitForIsLoading
extends
Action
{
...
...
@@ -1015,7 +1015,7 @@ public abstract class Action {
player
.
addListener
(
new
Player
.
EventListener
()
{
@Override
public
void
onLoadingChanged
(
boolean
isLoading
)
{
public
void
on
Is
LoadingChanged
(
boolean
isLoading
)
{
if
(
targetIsLoading
==
isLoading
)
{
player
.
removeListener
(
this
);
nextAction
.
schedule
(
player
,
trackSelector
,
surface
,
handler
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment