From 07855aadcf4b9aedee9cf3477366ef1aabbfda89 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Wed, 25 Feb 2015 14:13:04 +0000 Subject: [PATCH] Fix build after pull from dev --- .../android/exoplayer/demo/webm/DashRendererBuilder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java index 0e339d0b8b..9a636ac4fa 100644 --- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java +++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java @@ -36,6 +36,7 @@ import com.google.android.exoplayer.ext.vp9.LibvpxVideoTrackRenderer; import com.google.android.exoplayer.upstream.BufferPool; import com.google.android.exoplayer.upstream.DataSource; import com.google.android.exoplayer.upstream.DefaultBandwidthMeter; +import com.google.android.exoplayer.upstream.DefaultHttpDataSource; import com.google.android.exoplayer.upstream.UriDataSource; import com.google.android.exoplayer.util.ManifestFetcher; import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback; @@ -66,18 +67,19 @@ public class DashRendererBuilder implements ManifestCallback manifestFetcher = - new ManifestFetcher(parser, null, manifestUrl, userAgent); + new ManifestFetcher(manifestUrl, + new DefaultHttpDataSource(userAgent, null), parser); manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this); } @Override - public void onManifestError(String contentId, IOException e) { + public void onSingleManifestError(IOException e) { // TODO: do something meaningful here. e.printStackTrace(); } @Override - public void onManifest(String contentId, MediaPresentationDescription manifest) { + public void onSingleManifest(MediaPresentationDescription manifest) { LoadControl loadControl = new DefaultLoadControl(new BufferPool(BUFFER_SEGMENT_SIZE)); DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(null, null);