| Index: remoting/client/chromoting_client.cc
|
| diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
|
| index e6c59ee90491fa605273bb81116e27ed0d54747c..30c515f476a1c3011979f0a59436d5ffa854f422 100644
|
| --- a/remoting/client/chromoting_client.cc
|
| +++ b/remoting/client/chromoting_client.cc
|
| @@ -9,8 +9,8 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "remoting/base/capabilities.h"
|
| #include "remoting/base/constants.h"
|
| +#include "remoting/client/audio_consumer.h"
|
| #include "remoting/client/audio_decode_scheduler.h"
|
| -#include "remoting/client/audio_player.h"
|
| #include "remoting/client/client_context.h"
|
| #include "remoting/client/client_user_interface.h"
|
| #include "remoting/protocol/authenticator.h"
|
| @@ -28,16 +28,18 @@
|
|
|
| namespace remoting {
|
|
|
| -ChromotingClient::ChromotingClient(ClientContext* client_context,
|
| - ClientUserInterface* user_interface,
|
| - protocol::VideoRenderer* video_renderer,
|
| - std::unique_ptr<AudioPlayer> audio_player)
|
| +ChromotingClient::ChromotingClient(
|
| + ClientContext* client_context,
|
| + ClientUserInterface* user_interface,
|
| + protocol::VideoRenderer* video_renderer,
|
| + AudioConsumer* audio_consumer)
|
| : user_interface_(user_interface), video_renderer_(video_renderer) {
|
| DCHECK(client_context->main_task_runner()->BelongsToCurrentThread());
|
| - if (audio_player) {
|
| + if (audio_consumer) {
|
| audio_decode_scheduler_.reset(new AudioDecodeScheduler(
|
| client_context->main_task_runner(),
|
| - client_context->audio_decode_task_runner(), std::move(audio_player)));
|
| + client_context->audio_decode_task_runner(),
|
| + audio_consumer));
|
| }
|
| }
|
|
|
|
|