Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Unified Diff: webrtc/voice_engine/voice_engine_impl.h

Issue 2307533004: Moving/renaming webrtc/common.h. (Closed)
Patch Set: rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/voe_base_impl.cc ('k') | webrtc/voice_engine/voice_engine_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voice_engine_impl.h
diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h
index aa58007062d036826178bb6c91e3dd915fe80e75..3237001c01019acd9279553b721527746accaa38 100644
--- a/webrtc/voice_engine/voice_engine_impl.h
+++ b/webrtc/voice_engine/voice_engine_impl.h
@@ -83,8 +83,8 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
#endif
public VoEBaseImpl {
public:
- VoiceEngineImpl(const Config* config, bool owns_config)
- : SharedData(*config),
+ VoiceEngineImpl()
+ : SharedData(),
#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
VoEAudioProcessingImpl(this),
#endif
@@ -114,9 +114,7 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
VoEVolumeControlImpl(this),
#endif
VoEBaseImpl(this),
- _ref_count(0),
- own_config_(owns_config ? config : NULL) {
- }
+ _ref_count(0) {}
~VoiceEngineImpl() override { assert(_ref_count.Value() == 0); }
int AddRef();
@@ -132,8 +130,6 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
// manipulate the reference count. See: fake_voice_engine.h.
protected:
Atomic32 _ref_count;
- private:
- std::unique_ptr<const Config> own_config_;
};
} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_base_impl.cc ('k') | webrtc/voice_engine/voice_engine_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698