diff options
| author | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 06:59:59 +0000 |
|---|---|---|
| committer | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 06:59:59 +0000 |
| commit | 742677ab8a8ebbb6a279ae4641a65f381e5daa48 (patch) | |
| tree | 8d51293c6ad178459f8e92039bb659679687bfea /remoting/client | |
| parent | ebf00cd8a97e2baec47a03d4001238de7c7ef250 (diff) | |
| download | chromium_src-742677ab8a8ebbb6a279ae4641a65f381e5daa48.zip chromium_src-742677ab8a8ebbb6a279ae4641a65f381e5daa48.tar.gz chromium_src-742677ab8a8ebbb6a279ae4641a65f381e5daa48.tar.bz2 | |
Make AudioPlayer optional in ChromotingClient
Passing in a null pointer now disables the audio stream.
Review URL: https://chromiumcodereview.appspot.com/18452006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 10 | ||||
| -rw-r--r-- | remoting/client/chromoting_client.h | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 73a762d..2d308c9 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -41,10 +41,12 @@ ChromotingClient::ChromotingClient( new RectangleUpdateDecoder(client_context->main_task_runner(), client_context->decode_task_runner(), frame_consumer); - audio_decode_scheduler_.reset(new AudioDecodeScheduler( - client_context->main_task_runner(), - client_context->audio_decode_task_runner(), - audio_player.Pass())); + if (audio_player) { + audio_decode_scheduler_.reset(new AudioDecodeScheduler( + client_context->main_task_runner(), + client_context->audio_decode_task_runner(), + audio_player.Pass())); + } } ChromotingClient::~ChromotingClient() { diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index 3ccde00c..625a4d8 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h @@ -42,6 +42,7 @@ class SignalStrategy; class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback, public protocol::ClientStub { public: + // |audio_player| may be null, in which case audio will not be requested. ChromotingClient(const ClientConfig& config, ClientContext* client_context, protocol::ConnectionToHost* connection, |