diff options
| author | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-12 17:03:00 +0000 |
|---|---|---|
| committer | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-12 17:03:00 +0000 |
| commit | 4489c51faaf5b7e9f8845c5fb661f6ae91f7da48 (patch) | |
| tree | 6a21867a3a7578e9a35451dea75bc03b0a55cd76 /voice_engine/voice_engine_impl.h | |
| parent | 66bfae29aeb1ebbddac83471da9e1305a7edaf73 (diff) | |
| download | webrtc-4489c51faaf5b7e9f8845c5fb661f6ae91f7da48.tar.gz | |
This issue is related to
https://chromereviews.googleplex.com/9908014/
I was thinking about shipping ACM2 from the signal repository. There seems to be too many changes in one CL.
BUG=
R=andrew@webrtc.org, turaj@webrtc.org, xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2171004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4733 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine_impl.h')
| -rw-r--r-- | voice_engine/voice_engine_impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h index 55c42095..fe6a7915 100644 --- a/voice_engine/voice_engine_impl.h +++ b/voice_engine/voice_engine_impl.h @@ -98,7 +98,8 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class public VoEBaseImpl { public: - VoiceEngineImpl() : + VoiceEngineImpl(const Config* config, bool owns_config) : + SharedData(*config), #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API VoEAudioProcessingImpl(this), #endif @@ -137,7 +138,8 @@ public: VoEVolumeControlImpl(this), #endif VoEBaseImpl(this), - _ref_count(0) + _ref_count(0), + own_config_(owns_config ? config : NULL) { } virtual ~VoiceEngineImpl() @@ -152,6 +154,7 @@ public: private: Atomic32 _ref_count; + scoped_ptr<const Config> own_config_; }; } // namespace webrtc |