Simplify VideoReader and VideoWriter

remoting/protocol/connection_to_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/protocol/audio_writer.h"
 #include "remoting/protocol/session.h"
-#include "remoting/protocol/video_writer.h"
 
 namespace remoting {
 namespace protocol {
 
 class ClientStub;
 class ClipboardStub;
-class HostStub;
-class InputStub;
 class HostControlDispatcher;
 class HostEventDispatcher;
+class HostStub;
+class HostVideoDispatcher;
+class InputStub;
+class VideoStub;
 
 // This class represents a remote viewer connection to the chromoting
 // host. It sets up all protocol channels and connects them to the
 // stubs.
 class ConnectionToClient : public base::NonThreadSafe,
                            public Session::EventHandler {
  public:
   class EventHandler {
    public:
     // Called when the network connection is authenticating
@@ skipping 83 matching lines @@
   // Stubs that are called for incoming messages.
   ClipboardStub* clipboard_stub_;
   HostStub* host_stub_;
   InputStub* input_stub_;
 
   // The libjingle channel used to send and receive data from the remote client.
   scoped_ptr<Session> session_;
 
   scoped_ptr<HostControlDispatcher> control_dispatcher_;
   scoped_ptr<HostEventDispatcher> event_dispatcher_;
-  scoped_ptr<VideoWriter> video_writer_;
+  scoped_ptr<HostVideoDispatcher> video_dispatcher_;
   scoped_ptr<AudioWriter> audio_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClient);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_