Rename AudioDeviceSink

Author: hiroshihorie

modules/audio_device/audio_device_data_observer.cc

@@ -307,8 +307,8 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport {
   }
 #endif  // WEBRTC_IOS
 
-  int32_t SetAudioDeviceSink(AudioDeviceSink* sink) const override {
-    return impl_->SetAudioDeviceSink(sink);
+  int32_t SetObserver(AudioDeviceObserver* observer) const override {
+    return impl_->SetObserver(observer);
   }
 
  protected:

modules/audio_device/audio_device_generic.h

@@ -135,7 +135,7 @@ class AudioDeviceGeneric {
   virtual int GetRecordAudioParameters(AudioParameters* params) const;
 #endif  // WEBRTC_IOS
 
-  virtual int32_t SetAudioDeviceSink(AudioDeviceSink* sink) { return -1; }
+  virtual int32_t SetObserver(AudioDeviceObserver* observer) { return -1; }
   virtual int32_t GetPlayoutDevice() const { return -1; }
   virtual int32_t GetRecordingDevice() const { return -1; }
 

modules/audio_device/audio_device_impl.cc

@@ -902,9 +902,9 @@ int AudioDeviceModuleImpl::GetRecordAudioParameters(
 }
 #endif  // WEBRTC_IOS
 
-int32_t AudioDeviceModuleImpl::SetAudioDeviceSink(AudioDeviceSink* sink) const {
-  RTC_LOG(LS_INFO) << __FUNCTION__ << "(" << sink << ")";
-  int32_t ok = audio_device_->SetAudioDeviceSink(sink);
+int32_t AudioDeviceModuleImpl::SetObserver(AudioDeviceObserver* observer) const {
+  RTC_LOG(LS_INFO) << __FUNCTION__ << "(" << observer << ")";
+  int32_t ok = audio_device_->SetObserver(observer);
   RTC_LOG(LS_INFO) << "output: " << ok;
   return ok;
 }

modules/audio_device/audio_device_impl.h

@@ -156,7 +156,7 @@ class AudioDeviceModuleImpl : public AudioDeviceModuleForTest {
   int GetRecordAudioParameters(AudioParameters* params) const override;
 #endif  // WEBRTC_IOS
 
-  int32_t SetAudioDeviceSink(AudioDeviceSink* sink) const override;
+  int32_t SetObserver(AudioDeviceObserver* observer) const override;
   int32_t GetPlayoutDevice() const override;
   int32_t GetRecordingDevice() const override;
 

modules/audio_device/include/audio_device.h

@@ -21,10 +21,9 @@ namespace webrtc {
 
 class AudioDeviceModuleForTest;
 
-// Sink for callbacks related to a audio device.
-class AudioDeviceSink {
+class AudioDeviceObserver {
  public:
-  virtual ~AudioDeviceSink() = default;
+  virtual ~AudioDeviceObserver() = default;
 
   // input/output devices updated or default device changed
   virtual void OnDevicesUpdated() = 0;
@@ -182,7 +181,7 @@ class AudioDeviceModule : public rtc::RefCountInterface {
   virtual int GetRecordAudioParameters(AudioParameters* params) const = 0;
 #endif  // WEBRTC_IOS
 
-  virtual int32_t SetAudioDeviceSink(AudioDeviceSink* sink) const { return -1; }
+  virtual int32_t SetObserver(AudioDeviceObserver* observer) const { return -1; }
   virtual int32_t GetPlayoutDevice() const { return -1; }
   virtual int32_t GetRecordingDevice() const { return -1; }
 

modules/audio_device/mac/audio_device_mac.h

@@ -154,8 +154,8 @@ class AudioDeviceMac : public AudioDeviceGeneric {
   virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer)
       RTC_LOCKS_EXCLUDED(mutex_);
 
-  virtual int32_t SetAudioDeviceSink(AudioDeviceSink* sink) RTC_LOCKS_EXCLUDED(mutex_) {
-    audio_device_module_sink_ = sink;
+  virtual int32_t SetObserver(AudioDeviceObserver* observer) RTC_LOCKS_EXCLUDED(mutex_) {
+    audio_device_module_sink_ = observer;
     return 0;
   }
   virtual int32_t GetPlayoutDevice() const;
@@ -354,7 +354,7 @@ class AudioDeviceMac : public AudioDeviceGeneric {
   // 0x5c is key "9", after that comes function keys.
   bool prev_key_state_[0x5d];
 
-  AudioDeviceSink *audio_device_module_sink_ = nullptr;
+  AudioDeviceObserver *audio_device_module_sink_ = nullptr;
 };
 
 }  // namespace webrtc

modules/audio_device/win/audio_device_core_win.cc

@@ -3905,13 +3905,13 @@ int32_t AudioDeviceWindowsCore::_GetDeviceID(IMMDevice* pDevice,
   return 0;
 }
 
-int32_t AudioDeviceWindowsCore::SetAudioDeviceSink(AudioDeviceSink* sink) {
-  _deviceStateListener->SetAudioDeviceSink(sink);
+int32_t AudioDeviceWindowsCore::SetObserver(AudioDeviceObserver* observer) {
+  _deviceStateListener->SetObserver(observer);
   return 0;
 }
 
-void AudioDeviceWindowsCore::DeviceStateListener::SetAudioDeviceSink(AudioDeviceSink *sink) {
-  callback_ = sink;
+void AudioDeviceWindowsCore::DeviceStateListener::SetObserver(AudioDeviceObserver *observer) {
+  callback_ = observer;
 }
 
 HRESULT AudioDeviceWindowsCore::DeviceStateListener::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState) {

modules/audio_device/win/audio_device_core_win.h

@@ -73,11 +73,11 @@ class AudioDeviceWindowsCore : public AudioDeviceGeneric {
     ULONG __stdcall Release() override;
     HRESULT __stdcall QueryInterface(REFIID iid, void** object) override;
 
-    void SetAudioDeviceSink(AudioDeviceSink *sink);
+    void SetObserver(AudioDeviceObserver *sink);
 
    private:
     LONG ref_count_ = 1;
-    AudioDeviceSink *callback_ = nullptr;
+    AudioDeviceObserver *callback_ = nullptr;
   };
 
   static bool CoreAudioIsSupported();
@@ -180,7 +180,7 @@ class AudioDeviceWindowsCore : public AudioDeviceGeneric {
 
   virtual int32_t EnableBuiltInAEC(bool enable);
 
-  virtual int32_t SetAudioDeviceSink(AudioDeviceSink* sink);
+  virtual int32_t SetObserver(AudioDeviceObserver* observer);
 
  public:
   virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);

sdk/objc/api/peerconnection/RTCAudioDeviceModule.mm

@@ -23,13 +23,13 @@
 
 #import "sdk/objc/native/api/audio_device_module.h"
 
-class AudioDeviceSink : public webrtc::AudioDeviceSink {
+class AudioDeviceObserver : public webrtc::AudioDeviceObserver {
  public:
-  AudioDeviceSink() {}
+  AudioDeviceObserver() {}
 
   void OnDevicesUpdated() override {
 
-    RTCLogInfo(@"AudioDeviceSink OnDevicesUpdated");
+    RTCLogInfo(@"AudioDeviceObserver OnDevicesUpdated");
 
     if (callback_handler_) {
       callback_handler_();
@@ -43,7 +43,7 @@ void OnDevicesUpdated() override {
 @implementation RTC_OBJC_TYPE (RTCAudioDeviceModule) {
   rtc::Thread *_workerThread;
   rtc::scoped_refptr<webrtc::AudioDeviceModule> _native;
-  AudioDeviceSink *_sink;
+  AudioDeviceObserver *_observer;
 }
 
 - (instancetype)initWithNativeModule:(rtc::scoped_refptr<webrtc::AudioDeviceModule> )module
@@ -55,10 +55,10 @@ - (instancetype)initWithNativeModule:(rtc::scoped_refptr<webrtc::AudioDeviceModu
   _native = module;
   _workerThread = workerThread;
 
-  _sink = new AudioDeviceSink();
+  _observer = new AudioDeviceObserver();
 
   _workerThread->BlockingCall([self] {
-    _native->SetAudioDeviceSink(_sink);
+    _native->SetObserver(_observer);
   });
 
   return self;
@@ -242,6 +242,7 @@ - (BOOL)initRecording {
 
 - (BOOL)setDevicesUpdatedHandler: (nullable RTCOnAudioDevicesDidUpdate) handler {
   _sink->callback_handler_ = handler;
+  _observer->callback_handler_ = callback;
   return YES;
 }
 

sdk/objc/native/src/audio/audio_device_module_ios.h

@@ -130,7 +130,7 @@ class AudioDeviceModuleIOS : public AudioDeviceModule {
   int GetRecordAudioParameters(AudioParameters* params) const override;
 #endif  // WEBRTC_IOS
 
-  int32_t SetAudioDeviceSink(AudioDeviceSink* sink) const override;
+  int32_t SetObserver(AudioDeviceObserver* observer) const override;
 
  private:
   const bool bypass_voice_processing_;