summaryrefslogtreecommitdiffstats
path: root/media/mojo/services/mojo_renderer_service.cc
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2015-02-10 13:09:49 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-10 21:10:52 +0000
commit0a7a3314bd50725e8327f22afd5517e6a1325c89 (patch)
treee11612ca7ee4ab441886baf08703ec16295f2a9d /media/mojo/services/mojo_renderer_service.cc
parent30acccac63eab05248870f11aceb2c74ee76ccea (diff)
downloadchromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.zip
chromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.tar.gz
chromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.tar.bz2
Remove Client= from media_renderer.mojom
BUG=451321 TEST=mojo://media_test Review URL: https://codereview.chromium.org/911783002 Cr-Commit-Position: refs/heads/master@{#315639}
Diffstat (limited to 'media/mojo/services/mojo_renderer_service.cc')
-rw-r--r--media/mojo/services/mojo_renderer_service.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 8224986..2858d55 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -69,13 +69,13 @@ MojoRendererService::MojoRendererService()
MojoRendererService::~MojoRendererService() {
}
-void MojoRendererService::Initialize(mojo::DemuxerStreamPtr audio,
+void MojoRendererService::Initialize(mojo::MediaRendererClientPtr client,
+ mojo::DemuxerStreamPtr audio,
mojo::DemuxerStreamPtr video,
const mojo::Closure& callback) {
DVLOG(1) << __FUNCTION__;
DCHECK_EQ(state_, STATE_UNINITIALIZED);
- DCHECK(client());
-
+ client_ = client.Pass();
state_ = STATE_INITIALIZING;
stream_provider_.reset(new DemuxerStreamProviderShim(
audio.Pass(),
@@ -149,7 +149,7 @@ void MojoRendererService::UpdateMediaTime(bool force) {
if (!force && media_time == last_media_time_usec_)
return;
- client()->OnTimeUpdate(media_time, media_time);
+ client_->OnTimeUpdate(media_time, media_time);
last_media_time_usec_ = media_time;
}
@@ -169,20 +169,20 @@ void MojoRendererService::SchedulePeriodicMediaTimeUpdates() {
void MojoRendererService::OnBufferingStateChanged(
BufferingState new_buffering_state) {
DVLOG(2) << __FUNCTION__ << "(" << new_buffering_state << ") ";
- client()->OnBufferingStateChange(
+ client_->OnBufferingStateChange(
static_cast<mojo::BufferingState>(new_buffering_state));
}
void MojoRendererService::OnRendererEnded() {
DVLOG(1) << __FUNCTION__;
CancelPeriodicMediaTimeUpdates();
- client()->OnEnded();
+ client_->OnEnded();
}
void MojoRendererService::OnError(PipelineStatus error) {
DVLOG(1) << __FUNCTION__;
state_ = STATE_ERROR;
- client()->OnError();
+ client_->OnError();
}
void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {