| Index: webrtc/media/engine/webrtcvoe.h
|
| diff --git a/webrtc/media/engine/webrtcvoe.h b/webrtc/media/engine/webrtcvoe.h
|
| index eabde3659b1862763f2352729770456b4625b21d..6d99b5cbf1c8bfb33306900b43749e35eeab6233 100644
|
| --- a/webrtc/media/engine/webrtcvoe.h
|
| +++ b/webrtc/media/engine/webrtcvoe.h
|
| @@ -21,7 +21,6 @@
|
| #include "webrtc/voice_engine/include/voe_codec.h"
|
| #include "webrtc/voice_engine/include/voe_errors.h"
|
| #include "webrtc/voice_engine/include/voe_hardware.h"
|
| -#include "webrtc/voice_engine/include/voe_volume_control.h"
|
|
|
| namespace cricket {
|
| // automatically handles lifetime of WebRtc VoiceEngine
|
| @@ -78,25 +77,21 @@ class VoEWrapper {
|
| public:
|
| VoEWrapper()
|
| : engine_(webrtc::VoiceEngine::Create()),
|
| - base_(engine_), codec_(engine_), hw_(engine_),
|
| - volume_(engine_) {
|
| + base_(engine_), codec_(engine_), hw_(engine_) {
|
| }
|
| VoEWrapper(webrtc::VoEBase* base,
|
| webrtc::VoECodec* codec,
|
| - webrtc::VoEHardware* hw,
|
| - webrtc::VoEVolumeControl* volume)
|
| + webrtc::VoEHardware* hw)
|
| : engine_(NULL),
|
| base_(base),
|
| codec_(codec),
|
| - hw_(hw),
|
| - volume_(volume) {
|
| + hw_(hw) {
|
| }
|
| ~VoEWrapper() {}
|
| webrtc::VoiceEngine* engine() const { return engine_.get(); }
|
| webrtc::VoEBase* base() const { return base_.get(); }
|
| webrtc::VoECodec* codec() const { return codec_.get(); }
|
| webrtc::VoEHardware* hw() const { return hw_.get(); }
|
| - webrtc::VoEVolumeControl* volume() const { return volume_.get(); }
|
| int error() { return base_->LastError(); }
|
|
|
| private:
|
| @@ -104,7 +99,6 @@ class VoEWrapper {
|
| scoped_voe_ptr<webrtc::VoEBase> base_;
|
| scoped_voe_ptr<webrtc::VoECodec> codec_;
|
| scoped_voe_ptr<webrtc::VoEHardware> hw_;
|
| - scoped_voe_ptr<webrtc::VoEVolumeControl> volume_;
|
| };
|
| } // namespace cricket
|
|
|
|
|