Index: webrtc/pc/channelmanager.h |
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h |
index 72a2f056b5a4c0b6bb797f1a5792f575bb8a9ee3..b3af256115d575e464aed16c9ca3d3439d6dd57c 100644 |
--- a/webrtc/pc/channelmanager.h |
+++ b/webrtc/pc/channelmanager.h |
@@ -125,11 +125,7 @@ class ChannelManager { |
// Stops recording AEC dump. |
void StopAecDump(); |
- // Starts RtcEventLog using existing file. |
- bool StartRtcEventLog(rtc::PlatformFile file); |
- |
- // Stops logging RtcEventLog. |
- void StopRtcEventLog(); |
+ sigslot::signal2<VideoCapturer*, CaptureState> SignalVideoCaptureStateChange; |
the sun
2016/03/23 10:26:45
bad merge?
ivoc
2016/03/23 14:27:26
Oh, oops, I think this is from the common ancestor
|
private: |
typedef std::vector<VoiceChannel*> VoiceChannels; |