Remove SignalCaptureStateChange from MediaEngine.
It's no longer used by anything.
R=juberti@google.com
Review URL: https://webrtc-codereview.appspot.com/48069004
Cr-Commit-Position: refs/heads/master@{#8994}
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index 7ca216d..9dffff2 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -921,8 +921,6 @@
return true;
}
- sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
-
private:
std::vector<FakeVideoMediaChannel*> channels_;
std::vector<VideoCodec> codecs_;
diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index ba4d3ce..25adcee 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -141,9 +141,6 @@
virtual bool UnregisterVoiceProcessor(uint32 ssrc,
VoiceProcessor* video_processor,
MediaProcessorDirection direction) = 0;
-
- virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
- SignalVideoCaptureStateChange() = 0;
};
@@ -179,7 +176,6 @@
voice_.Terminate();
return false;
}
- SignalVideoCaptureStateChange().repeat(video_.SignalCaptureStateChange);
return true;
}
virtual void Terminate() {
@@ -266,15 +262,10 @@
MediaProcessorDirection direction) {
return voice_.UnregisterProcessor(ssrc, processor, direction);
}
- virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
- SignalVideoCaptureStateChange() {
- return signal_state_change_;
- }
protected:
VOICE voice_;
VIDEO video_;
- sigslot::repeater2<VideoCapturer*, CaptureState> signal_state_change_;
};
// NullVoiceEngine can be used with CompositeMediaEngine in the case where only
@@ -345,7 +336,6 @@
}
void SetLogging(int min_sev, const char* filter) {}
- sigslot::signal2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
private:
std::vector<VideoCodec> codecs_;
std::vector<RtpHeaderExtension> rtp_header_extensions_;
diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h
index cfd03ea..cb7f891 100644
--- a/talk/media/webrtc/webrtcvideoengine.h
+++ b/talk/media/webrtc/webrtcvideoengine.h
@@ -128,8 +128,6 @@
const std::vector<RtpHeaderExtension>& rtp_header_extensions() const;
void SetLogging(int min_sev, const char* filter);
- sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
-
// Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
// not take the ownership of |decoder_factory|. The caller needs to make sure
// that |decoder_factory| outlives the video engine.
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index 55c5484..446e984 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -142,8 +142,6 @@
WebRtcVideoEncoderFactory* encoder_factory);
bool EnableTimedRender();
- // This is currently ignored.
- sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
bool FindCodec(const VideoCodec& in);
bool CanSendCodec(const VideoCodec& in,
diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
index eca4729..548c84b 100644
--- a/talk/session/media/channelmanager.cc
+++ b/talk/session/media/channelmanager.cc
@@ -131,10 +131,6 @@
SignalDevicesChange.repeat(device_manager_->SignalDevicesChange);
device_manager_->Init();
- // Camera is started asynchronously, request callbacks when startup
- // completes to be able to forward them to the rendering manager.
- media_engine_->SignalVideoCaptureStateChange().connect(
- this, &ChannelManager::OnVideoCaptureStateChange);
capture_manager_->SignalCapturerStateChange.connect(
this, &ChannelManager::OnVideoCaptureStateChange);
}
