Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5823)

Unified Diff: chromecast/media/base/switching_media_renderer.cc

Issue 979913002: Chromecast: replay buildfixes in SwitchingMediaRenderer code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/media/base/switching_media_renderer.cc
diff --git a/chromecast/media/base/switching_media_renderer.cc b/chromecast/media/base/switching_media_renderer.cc
index 16ffd12b77256b7d714f2766f654b0ca6f94c261..ec8b1521e4a2fdbadf973840cf6a6d144d027c8a 100644
--- a/chromecast/media/base/switching_media_renderer.cc
+++ b/chromecast/media/base/switching_media_renderer.cc
@@ -26,12 +26,13 @@ SwitchingMediaRenderer::~SwitchingMediaRenderer() {
void SwitchingMediaRenderer::Initialize(
::media::DemuxerStreamProvider* demuxer_stream_provider,
- const base::Closure& init_cb,
+ const ::media::PipelineStatusCB& init_cb,
const ::media::StatisticsCB& statistics_cb,
const ::media::BufferingStateCB& buffering_state_cb,
const ::media::Renderer::PaintCB& paint_cb,
const base::Closure& ended_cb,
- const ::media::PipelineStatusCB& error_cb) {
+ const ::media::PipelineStatusCB& error_cb,
+ const base::Closure& waiting_for_decryption_key_cb) {
// At this point the DemuxerStreamProvider should be fully initialized, so we
// have enough information to decide which renderer to use.
demuxer_stream_provider_ = demuxer_stream_provider;
@@ -50,9 +51,9 @@ void SwitchingMediaRenderer::Initialize(
default_renderer_.reset();
}
- return GetRenderer()->Initialize(demuxer_stream_provider,
- init_cb, statistics_cb, buffering_state_cb,
- paint_cb, ended_cb, error_cb);
+ return GetRenderer()->Initialize(
+ demuxer_stream_provider, init_cb, statistics_cb, buffering_state_cb,
+ paint_cb, ended_cb, error_cb, waiting_for_decryption_key_cb);
}
::media::Renderer* SwitchingMediaRenderer::GetRenderer() const {
« no previous file with comments | « chromecast/media/base/switching_media_renderer.h ('k') | chromecast/renderer/media/chromecast_media_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698