From c17ca5354a1c16bc12e6ae9c776dcb6df0ccf661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 31 May 2018 15:36:49 +0200 Subject: [PATCH] Delete deprecated VideoTrackSource constructor. This is a followup to https://webrtc-review.googlesource.com/c/src/+/78403 Bug: None Change-Id: I6dc29b13b333ff8836d7d0f3dc21aba0ad66b5bb Reviewed-on: https://webrtc-review.googlesource.com/80243 Reviewed-by: Per Kjellander Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#23568} --- pc/videotracksource.cc | 6 +----- pc/videotracksource.h | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pc/videotracksource.cc b/pc/videotracksource.cc index de87acb21d..bf4fd643a5 100644 --- a/pc/videotracksource.cc +++ b/pc/videotracksource.cc @@ -14,13 +14,9 @@ namespace webrtc { -VideoTrackSource::VideoTrackSource(bool remote) - : VideoTrackSource(nullptr, remote) {} - VideoTrackSource::VideoTrackSource( - rtc::VideoSourceInterface* source, bool remote) - : source_(source), state_(kInitializing), remote_(remote) { + : state_(kInitializing), remote_(remote) { worker_thread_checker_.DetachFromThread(); } diff --git a/pc/videotracksource.h b/pc/videotracksource.h index f3eef3b675..fb6c7be52b 100644 --- a/pc/videotracksource.h +++ b/pc/videotracksource.h @@ -24,8 +24,6 @@ namespace webrtc { class VideoTrackSource : public Notifier { public: explicit VideoTrackSource(bool remote); - // TODO(nisse): Delete, kept only for temporary backwards compatibility. - VideoTrackSource(rtc::VideoSourceInterface* source, bool remote); void SetState(SourceState new_state); SourceState state() const override { return state_; } @@ -41,14 +39,10 @@ class VideoTrackSource : public Notifier { void RemoveSink(rtc::VideoSinkInterface* sink) override; protected: - // TODO(nisse): Default implementations for temporary backwards - // compatibility. - virtual rtc::VideoSourceInterface* source() { return source_; } + virtual rtc::VideoSourceInterface* source() = 0; private: rtc::ThreadChecker worker_thread_checker_; - // TODO(nisse): Delete, kept only for temporary backwards compatibility. - rtc::VideoSourceInterface* source_; SourceState state_; const bool remote_; };