Chromium Code Reviews| Index: webrtc/voice_engine/shared_data.h |
| diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h |
| index 9c3d4b1c572f3228b7cfeb50fabbb47640a5479b..8d4620f0cc51044d765ddf06d6b399ec3c550dec 100644 |
| --- a/webrtc/voice_engine/shared_data.h |
| +++ b/webrtc/voice_engine/shared_data.h |
| @@ -12,6 +12,7 @@ |
| #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H |
| #include "webrtc/base/scoped_ptr.h" |
| +#include "webrtc/base/scoped_ref_ptr.h" |
| #include "webrtc/modules/audio_device/include/audio_device.h" |
| #include "webrtc/modules/audio_processing/include/audio_processing.h" |
| #include "webrtc/modules/utility/include/process_thread.h" |
| @@ -37,8 +38,8 @@ public: |
| uint32_t instance_id() const { return _instanceId; } |
| Statistics& statistics() { return _engineStatistics; } |
| ChannelManager& channel_manager() { return _channelManager; } |
| - AudioDeviceModule* audio_device() { return _audioDevicePtr; } |
| - void set_audio_device(AudioDeviceModule* audio_device); |
| + AudioDeviceModule* audio_device() { return _audioDevicePtr.get(); } |
| + void set_audio_device(rtc::scoped_refptr<AudioDeviceModule> audio_device); |
|
tommi
2016/01/07 16:41:40
const &
pbos-webrtc
2016/01/07 17:23:16
Done.
|
| AudioProcessing* audio_processing() { return audioproc_.get(); } |
| void set_audio_processing(AudioProcessing* audio_processing); |
| TransmitMixer* transmit_mixer() { return _transmitMixerPtr; } |
| @@ -66,7 +67,7 @@ protected: |
| CriticalSectionWrapper* _apiCritPtr; |
| ChannelManager _channelManager; |
| Statistics _engineStatistics; |
| - AudioDeviceModule* _audioDevicePtr; |
| + rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr; |
| OutputMixer* _outputMixerPtr; |
| TransmitMixer* _transmitMixerPtr; |
| rtc::scoped_ptr<AudioProcessing> audioproc_; |