| Index: talk/session/media/channel.h
|
| diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
|
| index 0a7ce9d1a9e8355bc83ac4433a751ef22deb0354..9886454668f9c359da3a35567600cf96b812c4cf 100644
|
| --- a/talk/session/media/channel.h
|
| +++ b/talk/session/media/channel.h
|
| @@ -388,11 +388,6 @@ class VoiceChannel : public BaseChannel {
|
| int GetOutputLevel_w();
|
| void GetActiveStreams_w(AudioInfo::StreamList* actives);
|
|
|
| - // Signal errors from VoiceMediaChannel. Arguments are:
|
| - // ssrc(uint32), and error(VoiceMediaChannel::Error).
|
| - sigslot::signal3<VoiceChannel*, uint32, VoiceMediaChannel::Error>
|
| - SignalMediaError;
|
| -
|
| private:
|
| // overrides from BaseChannel
|
| virtual void OnChannelRead(TransportChannel* channel,
|
| @@ -419,9 +414,6 @@ class VoiceChannel : public BaseChannel {
|
| virtual void OnMediaMonitorUpdate(
|
| VoiceMediaChannel* media_channel, const VoiceMediaInfo& info);
|
| void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info);
|
| - void OnVoiceChannelError(uint32 ssrc, VoiceMediaChannel::Error error);
|
| - void SendLastMediaError();
|
| - void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
|
|
|
| static const int kEarlyMediaTimeout = 1000;
|
| MediaEngineInterface* media_engine_;
|
| @@ -480,8 +472,6 @@ class VideoChannel : public BaseChannel {
|
|
|
| bool SendIntraFrame();
|
| bool RequestIntraFrame();
|
| - sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error>
|
| - SignalMediaError;
|
|
|
| // Configure sending media on the stream with SSRC |ssrc|
|
| // If there is only one sending stream SSRC 0 can be used.
|
| @@ -520,9 +510,6 @@ class VideoChannel : public BaseChannel {
|
| virtual void OnStateChange(VideoCapturer* capturer, CaptureState ev);
|
| bool GetLocalSsrc(const VideoCapturer* capturer, uint32* ssrc);
|
|
|
| - void OnVideoChannelError(uint32 ssrc, VideoMediaChannel::Error error);
|
| - void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
|
| -
|
| VideoRenderer* renderer_;
|
| ScreencastMap screencast_capturers_;
|
| rtc::scoped_ptr<VideoMediaMonitor> media_monitor_;
|
| @@ -563,8 +550,6 @@ class DataChannel : public BaseChannel {
|
| sigslot::signal2<DataChannel*, const DataMediaInfo&> SignalMediaMonitor;
|
| sigslot::signal2<DataChannel*, const std::vector<ConnectionInfo>&>
|
| SignalConnectionMonitor;
|
| - sigslot::signal3<DataChannel*, uint32, DataMediaChannel::Error>
|
| - SignalMediaError;
|
| sigslot::signal3<DataChannel*,
|
| const ReceiveDataParams&,
|
| const rtc::Buffer&>
|
| @@ -645,7 +630,6 @@ class DataChannel : public BaseChannel {
|
| const ReceiveDataParams& params, const char* data, size_t len);
|
| void OnDataChannelError(uint32 ssrc, DataMediaChannel::Error error);
|
| void OnDataChannelReadyToSend(bool writable);
|
| - void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
|
| void OnStreamClosedRemotely(uint32 sid);
|
|
|
| rtc::scoped_ptr<DataMediaMonitor> media_monitor_;
|
|
|