From 2fd09a40af90e79b3a5a514e96c455783de6bcba Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sat, 19 Jan 2019 16:50:32 +0100 Subject: [PATCH] Remove deprecated code from audio device. Bug: webrtc:7306, webrtc:10198 Change-Id: Iaeef4d7449c18325511f1763eba510b385959bfe Reviewed-on: https://webrtc-review.googlesource.com/c/118446 Reviewed-by: Henrik Andreassson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#26383} --- modules/audio_device/android/audio_device_unittest.cc | 2 +- modules/audio_device/audio_device_data_observer.cc | 9 --------- modules/audio_device/audio_device_impl.cc | 8 -------- modules/audio_device/include/audio_device.h | 11 ----------- .../audio_device/include/audio_device_data_observer.h | 6 ------ modules/audio_device/include/mock_audio_device.h | 1 - modules/audio_device/ios/audio_device_unittest_ios.mm | 3 +-- 7 files changed, 2 insertions(+), 38 deletions(-) diff --git a/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc index ec6646c3a0..350eae918c 100644 --- a/modules/audio_device/android/audio_device_unittest.cc +++ b/modules/audio_device/android/audio_device_unittest.cc @@ -514,7 +514,7 @@ class AudioDeviceTest : public ::testing::Test { rtc::scoped_refptr CreateAudioDevice( AudioDeviceModule::AudioLayer audio_layer) { rtc::scoped_refptr module( - AudioDeviceModule::Create(0, audio_layer)); + AudioDeviceModule::Create(audio_layer)); return module; } diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 56ba32b018..d9e6cdad62 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -289,13 +289,4 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( return audio_device; } - -// TODO(bugs.webrtc.org/7306): deprecated. -rtc::scoped_refptr CreateAudioDeviceWithDataObserver( - const int32_t id, - const AudioDeviceModule::AudioLayer audio_layer, - AudioDeviceDataObserver* observer) { - return CreateAudioDeviceWithDataObserver(audio_layer, observer); -} - } // namespace webrtc diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index 3fa95d3bc5..e44a62db8a 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -112,14 +112,6 @@ rtc::scoped_refptr AudioDeviceModule::CreateForTest( return audioDevice; } -// TODO(bugs.webrtc.org/7306): deprecated. -rtc::scoped_refptr AudioDeviceModule::Create( - const int32_t id, - const AudioLayer audio_layer) { - RTC_LOG(INFO) << __FUNCTION__; - return AudioDeviceModule::Create(audio_layer); -} - AudioDeviceModuleImpl::AudioDeviceModuleImpl(const AudioLayer audioLayer) : audio_layer_(audioLayer) { RTC_LOG(INFO) << __FUNCTION__; diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h index c8f75031a5..1afb4eec96 100644 --- a/modules/audio_device/include/audio_device.h +++ b/modules/audio_device/include/audio_device.h @@ -21,10 +21,6 @@ class AudioDeviceModuleForTest; class AudioDeviceModule : public rtc::RefCountInterface { public: - // Deprecated. - // TODO(henrika): to be removed. - enum ErrorCode { kAdmErrNone = 0, kAdmErrArgument = 1 }; - enum AudioLayer { kPlatformDefaultAudio = 0, kWindowsCoreAudio, @@ -44,9 +40,6 @@ class AudioDeviceModule : public rtc::RefCountInterface { kDefaultDevice = -2 }; - // TODO(bugs.webrtc.org/7306): deprecated. - enum ChannelType { kChannelLeft = 0, kChannelRight = 1, kChannelBoth = 2 }; - public: // Creates a default ADM for usage in production code. static rtc::scoped_refptr Create( @@ -55,10 +48,6 @@ class AudioDeviceModule : public rtc::RefCountInterface { // in production code. static rtc::scoped_refptr CreateForTest( const AudioLayer audio_layer); - // TODO(bugs.webrtc.org/7306): deprecated (to be removed). - static rtc::scoped_refptr Create( - const int32_t id, - const AudioLayer audio_layer); // Retrieve the currently utilized audio layer virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const = 0; diff --git a/modules/audio_device/include/audio_device_data_observer.h b/modules/audio_device/include/audio_device_data_observer.h index 959cfa4662..67ef98f310 100644 --- a/modules/audio_device/include/audio_device_data_observer.h +++ b/modules/audio_device/include/audio_device_data_observer.h @@ -44,12 +44,6 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( const AudioDeviceModule::AudioLayer audio_layer, AudioDeviceDataObserver* observer); -// TODO(bugs.webrtc.org/7306): deprecated. -rtc::scoped_refptr CreateAudioDeviceWithDataObserver( - const int32_t id, - const AudioDeviceModule::AudioLayer audio_layer, - AudioDeviceDataObserver* observer); - } // namespace webrtc #endif // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h index 105442b807..011886fc72 100644 --- a/modules/audio_device/include/mock_audio_device.h +++ b/modules/audio_device/include/mock_audio_device.h @@ -26,7 +26,6 @@ class MockAudioDeviceModule : public AudioDeviceModule { MOCK_CONST_METHOD0(Release, rtc::RefCountReleaseStatus()); // AudioDeviceModule. MOCK_CONST_METHOD1(ActiveAudioLayer, int32_t(AudioLayer* audioLayer)); - MOCK_CONST_METHOD0(LastError, ErrorCode()); MOCK_METHOD1(RegisterAudioCallback, int32_t(AudioTransport* audioCallback)); MOCK_METHOD0(Init, int32_t()); MOCK_METHOD0(Terminate, int32_t()); diff --git a/modules/audio_device/ios/audio_device_unittest_ios.mm b/modules/audio_device/ios/audio_device_unittest_ios.mm index 983ad5d6da..c46a853bb8 100644 --- a/modules/audio_device/ios/audio_device_unittest_ios.mm +++ b/modules/audio_device/ios/audio_device_unittest_ios.mm @@ -518,8 +518,7 @@ class AudioDeviceTest : public ::testing::Test { rtc::scoped_refptr CreateAudioDevice( AudioDeviceModule::AudioLayer audio_layer) { - rtc::scoped_refptr module( - AudioDeviceModule::Create(0, audio_layer)); + rtc::scoped_refptr module(AudioDeviceModule::Create(audio_layer)); return module; }