| Index: remoting/client/chromoting_client.h
|
| diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
|
| index 377badbf47ff47e7a843d9356c26c8b5439f53fa..f2355f1ed6b85e750dbdb249c6c32563638b9f35 100644
|
| --- a/remoting/client/chromoting_client.h
|
| +++ b/remoting/client/chromoting_client.h
|
| @@ -15,7 +15,6 @@
|
| #include "base/time.h"
|
| #include "remoting/client/client_config.h"
|
| #include "remoting/client/chromoting_stats.h"
|
| -#include "remoting/protocol/audio_stub.h"
|
| #include "remoting/protocol/client_stub.h"
|
| #include "remoting/protocol/clipboard_stub.h"
|
| #include "remoting/protocol/connection_to_host.h"
|
| @@ -33,23 +32,24 @@ namespace protocol {
|
| class TransportFactory;
|
| } // namespace protocol
|
|
|
| +class AudioDecodeScheduler;
|
| class AudioPlayer;
|
| +class ClientContext;
|
| class ClientUserInterface;
|
| class RectangleUpdateDecoder;
|
|
|
| // TODO(sergeyu): Move VideoStub implementation to RectangleUpdateDecoder.
|
| class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
|
| public protocol::ClientStub,
|
| - public protocol::VideoStub,
|
| - public protocol::AudioStub {
|
| + public protocol::VideoStub {
|
| public:
|
| // Objects passed in are not owned by this class.
|
| ChromotingClient(const ClientConfig& config,
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| + ClientContext* client_context,
|
| protocol::ConnectionToHost* connection,
|
| ClientUserInterface* user_interface,
|
| RectangleUpdateDecoder* rectangle_decoder,
|
| - AudioPlayer* audio_player);
|
| + scoped_ptr<AudioPlayer> audio_player);
|
|
|
| virtual ~ChromotingClient();
|
|
|
| @@ -80,10 +80,6 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
|
| const base::Closure& done) OVERRIDE;
|
| virtual int GetPendingVideoPackets() OVERRIDE;
|
|
|
| - // AudioStub implementation.
|
| - virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
|
| - const base::Closure& done) OVERRIDE;
|
| -
|
| private:
|
| struct QueuedVideoPacket {
|
| QueuedVideoPacket(scoped_ptr<VideoPacket> packet,
|
| @@ -112,8 +108,10 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| protocol::ConnectionToHost* connection_;
|
| ClientUserInterface* user_interface_;
|
| + // TODO(kxing): Make ChromotingClient own RectangleUpdateDecoder.
|
| RectangleUpdateDecoder* rectangle_decoder_;
|
| - AudioPlayer* audio_player_;
|
| +
|
| + scoped_ptr<AudioDecodeScheduler> audio_decode_scheduler_;
|
|
|
| // If non-NULL, this is called when the client is done.
|
| base::Closure client_done_;
|
|
|