exttex
/
just_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly return null duration on Android.

This commit is contained in:
Ryan Heise 2020-12-15 20:41:13 +11:00
parent fb7d33f0c6
commit f2c2a77908
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
View File

@ -210,7 +210,7 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener, Aud
if (prepareResult != null) { if (prepareResult != null) {
transition(ProcessingState.ready); transition(ProcessingState.ready);
Map<String, Object> response = new HashMap<>(); Map<String, Object> response = new HashMap<>();
response.put("duration", 1000 * getDuration()); response.put("duration", getDuration() == C.TIME_UNSET ? null : (1000 * getDuration()));
prepareResult.success(response); prepareResult.success(response);
prepareResult = null; prepareResult = null;
} else { } else {
@ -543,13 +543,13 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener, Aud
private void broadcastPlaybackEvent() { private void broadcastPlaybackEvent() {
final Map<String, Object> event = new HashMap<String, Object>(); final Map<String, Object> event = new HashMap<String, Object>();
long updatePosition = getCurrentPosition(); long updatePosition = getCurrentPosition();
long duration = getDuration(); Long duration = getDuration() == C.TIME_UNSET ? null : (1000 * getDuration());
event.put("processingState", processingState.ordinal()); event.put("processingState", processingState.ordinal());
event.put("updatePosition", 1000 * updatePosition); event.put("updatePosition", 1000 * updatePosition);
event.put("updateTime", System.currentTimeMillis()); event.put("updateTime", System.currentTimeMillis());
event.put("bufferedPosition", 1000 * Math.max(updatePosition, bufferedPosition)); event.put("bufferedPosition", 1000 * Math.max(updatePosition, bufferedPosition));
event.put("icyMetadata", collectIcyMetadata()); event.put("icyMetadata", collectIcyMetadata());
event.put("duration", 1000 * getDuration()); event.put("duration", duration);
event.put("currentIndex", currentIndex); event.put("currentIndex", currentIndex);
event.put("androidAudioSessionId", audioSessionId); event.put("androidAudioSessionId", audioSessionId);