From cc04fd1e76b988ac696271501355b71875ec13f0 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 14 Aug 2014 16:19:30 +0100 Subject: [PATCH] Fix the build. --- .../exoplayer/demo/full/EventLogger.java | 4 ++-- .../exoplayer/demo/full/player/DemoPlayer.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/full/EventLogger.java b/demo/src/main/java/com/google/android/exoplayer/demo/full/EventLogger.java index 2098997297..722e21c45e 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/full/EventLogger.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/full/EventLogger.java @@ -92,7 +92,7 @@ public class EventLogger implements DemoPlayer.Listener, DemoPlayer.InfoListener @Override public void onLoadStarted(int sourceId, String formatId, int trigger, boolean isInitialization, - int mediaStartTimeMs, int mediaEndTimeMs, long totalBytes) { + int mediaStartTimeMs, int mediaEndTimeMs, long length) { loadStartTimeMs[sourceId] = SystemClock.elapsedRealtime(); if (VerboseLogUtil.isTagEnabled(TAG)) { Log.v(TAG, "loadStart [" + getSessionTimeString() + ", " + sourceId @@ -101,7 +101,7 @@ public class EventLogger implements DemoPlayer.Listener, DemoPlayer.InfoListener } @Override - public void onLoadCompleted(int sourceId) { + public void onLoadCompleted(int sourceId, long bytesLoaded) { if (VerboseLogUtil.isTagEnabled(TAG)) { long downloadTime = SystemClock.elapsedRealtime() - loadStartTimeMs[sourceId]; Log.v(TAG, "loadEnd [" + getSessionTimeString() + ", " + sourceId + ", " + diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/full/player/DemoPlayer.java b/demo/src/main/java/com/google/android/exoplayer/demo/full/player/DemoPlayer.java index 63a2557541..bdaa2e5a73 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/full/player/DemoPlayer.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/full/player/DemoPlayer.java @@ -123,8 +123,8 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi void onDroppedFrames(int count, long elapsed); void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate); void onLoadStarted(int sourceId, String formatId, int trigger, boolean isInitialization, - int mediaStartTimeMs, int mediaEndTimeMs, long totalBytes); - void onLoadCompleted(int sourceId); + int mediaStartTimeMs, int mediaEndTimeMs, long length); + void onLoadCompleted(int sourceId, long bytesLoaded); } /** @@ -471,34 +471,34 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi @Override public void onLoadStarted(int sourceId, String formatId, int trigger, boolean isInitialization, - int mediaStartTimeMs, int mediaEndTimeMs, long totalBytes) { + int mediaStartTimeMs, int mediaEndTimeMs, long length) { if (infoListener != null) { infoListener.onLoadStarted(sourceId, formatId, trigger, isInitialization, mediaStartTimeMs, - mediaEndTimeMs, totalBytes); + mediaEndTimeMs, length); } } @Override - public void onLoadCompleted(int sourceId) { + public void onLoadCompleted(int sourceId, long bytesLoaded) { if (infoListener != null) { - infoListener.onLoadCompleted(sourceId); + infoListener.onLoadCompleted(sourceId, bytesLoaded); } } @Override - public void onLoadCanceled(int sourceId) { + public void onLoadCanceled(int sourceId, long bytesLoaded) { // Do nothing. } @Override public void onUpstreamDiscarded(int sourceId, int mediaStartTimeMs, int mediaEndTimeMs, - long totalBytes) { + long bytesDiscarded) { // Do nothing. } @Override public void onDownstreamDiscarded(int sourceId, int mediaStartTimeMs, int mediaEndTimeMs, - long totalBytes) { + long bytesDiscarded) { // Do nothing. }