From 0a7a3314bd50725e8327f22afd5517e6a1325c89 Mon Sep 17 00:00:00 2001 From: dalecurtis Date: Tue, 10 Feb 2015 13:09:49 -0800 Subject: 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} --- media/mojo/services/mojo_renderer_impl.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'media/mojo/services/mojo_renderer_impl.cc') diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc index bf422a3..6abed01 100644 --- a/media/mojo/services/mojo_renderer_impl.cc +++ b/media/mojo/services/mojo_renderer_impl.cc @@ -21,7 +21,8 @@ MojoRendererImpl::MojoRendererImpl( const scoped_refptr& task_runner, mojo::MediaRendererPtr remote_media_renderer) : task_runner_(task_runner), - remote_media_renderer_pipe_(remote_media_renderer.PassMessagePipe()), + remote_media_renderer_(remote_media_renderer.Pass()), + binding_(this), weak_factory_(this) { DVLOG(1) << __FUNCTION__; } @@ -45,15 +46,6 @@ void MojoRendererImpl::Initialize( DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(demuxer_stream_provider); - // Bind the mojo InterfacePtr to the message pipe on the - // current thread so we can use it. The MojoRendererImpl object - // is constructed on another thread so we can't do it in the - // constructor and must pass a message pipe around since - // InterfacePtr's are tied to the message loop they were created on. - remote_media_renderer_.Bind(remote_media_renderer_pipe_.Pass()); - DCHECK(remote_media_renderer_); - remote_media_renderer_.set_client(this); - demuxer_stream_provider_ = demuxer_stream_provider; init_cb_ = init_cb; ended_cb_ = ended_cb; @@ -79,7 +71,10 @@ void MojoRendererImpl::Initialize( ->DidConnect(); } + mojo::MediaRendererClientPtr client_ptr; + binding_.Bind(GetProxy(&client_ptr)); remote_media_renderer_->Initialize( + client_ptr.Pass(), audio_stream.Pass(), video_stream.Pass(), BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized, -- cgit v1.1