From 86101e9c088c287a70f63d2430935ce58c6427b7 Mon Sep 17 00:00:00 2001 From: solenberg Date: Fri, 1 Apr 2016 01:01:25 -0700 Subject: [PATCH] Remove deprecated RtpReceiver::CreateAudioReceiver() function. BUG=webrtc:4690 Review URL: https://codereview.webrtc.org/1848813003 Cr-Commit-Position: refs/heads/master@{#12192} --- webrtc/modules/rtp_rtcp/include/rtp_receiver.h | 10 ---------- webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc | 13 ------------- 2 files changed, 23 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/include/rtp_receiver.h b/webrtc/modules/rtp_rtcp/include/rtp_receiver.h index 0a3e201c74..f393e41eab 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_receiver.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_receiver.h @@ -16,7 +16,6 @@ namespace webrtc { -class RtpAudioFeedback; class RTPPayloadRegistry; class TelephoneEventHandler { @@ -50,15 +49,6 @@ class RtpReceiver { RtpFeedback* incoming_messages_callback, RTPPayloadRegistry* rtp_payload_registry); - // DEPRECATED: Creates an audio-enabled RTP receiver. - // TODO(solenberg): Remove, after updating downstream code. - static RtpReceiver* CreateAudioReceiver( - Clock* clock, - RtpAudioFeedback* incoming_audio_feedback, - RtpData* incoming_payload_callback, - RtpFeedback* incoming_messages_callback, - RTPPayloadRegistry* rtp_payload_registry); - virtual ~RtpReceiver() {} // Returns a TelephoneEventHandler if available. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc index 42c0cd44f9..6f2efe783a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc @@ -52,19 +52,6 @@ RtpReceiver* RtpReceiver::CreateAudioReceiver( RTPReceiverStrategy::CreateAudioStrategy(incoming_payload_callback)); } -// TODO(solenberg): Remove, after updating downstream code. -RtpReceiver* RtpReceiver::CreateAudioReceiver( - Clock* clock, - RtpAudioFeedback* incoming_audio_feedback, - RtpData* incoming_payload_callback, - RtpFeedback* incoming_messages_callback, - RTPPayloadRegistry* rtp_payload_registry) { - return CreateAudioReceiver(clock, - incoming_payload_callback, - incoming_messages_callback, - rtp_payload_registry); -} - RtpReceiverImpl::RtpReceiverImpl( Clock* clock, RtpFeedback* incoming_messages_callback,