| Index: remoting/protocol/rtp_video_writer.h
|
| ===================================================================
|
| --- remoting/protocol/rtp_video_writer.h (revision 96105)
|
| +++ remoting/protocol/rtp_video_writer.h (working copy)
|
| @@ -5,7 +5,6 @@
|
| #ifndef REMOTING_PROTOCOL_RTP_VIDEO_WRITER_H_
|
| #define REMOTING_PROTOCOL_RTP_VIDEO_WRITER_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "remoting/protocol/rtp_writer.h"
|
| #include "remoting/protocol/video_writer.h"
|
|
|
| @@ -20,8 +19,7 @@
|
| virtual ~RtpVideoWriter();
|
|
|
| // VideoWriter interface.
|
| - virtual void Init(protocol::Session* session,
|
| - const InitializedCallback& callback) OVERRIDE;
|
| + virtual void Init(protocol::Session* session) OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
|
|
| // VideoStub interface.
|
| @@ -30,14 +28,7 @@
|
| virtual int GetPendingPackets() OVERRIDE;
|
|
|
| private:
|
| - void OnChannelReady(const std::string& name, net::Socket* socket);
|
| -
|
| - bool initialized_;
|
| - InitializedCallback initialized_callback_;
|
| -
|
| - scoped_ptr<net::Socket> rtp_channel_;
|
| RtpWriter rtp_writer_;
|
| - scoped_ptr<net::Socket> rtcp_channel_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RtpVideoWriter);
|
| };
|
|
|