diff options
| author | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:30:53 +0000 |
|---|---|---|
| committer | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:30:53 +0000 |
| commit | 8441981bafc38a54df69ced19afd385757bc6e2b (patch) | |
| tree | 3bedfd443d8b903186a38b811f0ceddddfc3340c /remoting/client | |
| parent | 4ac195b934b7c8d7584221a131990df2661f57b1 (diff) | |
| download | chromium_src-8441981bafc38a54df69ced19afd385757bc6e2b.zip chromium_src-8441981bafc38a54df69ced19afd385757bc6e2b.tar.gz chromium_src-8441981bafc38a54df69ced19afd385757bc6e2b.tar.bz2 | |
Create and destroy Pepper audio player on connect and disconnect.
Review URL: https://chromiumcodereview.appspot.com/10800077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 873586c..71ccd2a 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -228,7 +228,6 @@ bool ChromotingInstance::Init(uint32_t argc, context_.decode_task_runner(), consumer_proxy); view_.reset(new PepperView(this, &context_, rectangle_decoder_.get())); consumer_proxy->Attach(view_->AsWeakPtr()); - audio_player_.reset(new PepperAudioPlayer(this)); return true; } @@ -476,6 +475,7 @@ void ChromotingInstance::Connect(const ClientConfig& config) { jingle_glue::JingleThreadWrapper::EnsureForCurrentThread(); host_connection_.reset(new protocol::ConnectionToHost(true)); + audio_player_.reset(new PepperAudioPlayer(this)); client_.reset(new ChromotingClient(config, context_.main_task_runner(), host_connection_.get(), this, rectangle_decoder_.get(), @@ -541,6 +541,7 @@ void ChromotingInstance::Disconnect() { input_handler_.reset(); input_tracker_.reset(); mouse_input_filter_.reset(); + audio_player_.reset(); host_connection_.reset(); } |