Index: talk/media/webrtc/webrtcvoe.h |
diff --git a/talk/media/webrtc/webrtcvoe.h b/talk/media/webrtc/webrtcvoe.h |
index aa705a014d648a2b9054beb4ab50d891ee61ab22..341c5d35cd7007847a76ecf99a6f4ab731ffaaea 100644 |
--- a/talk/media/webrtc/webrtcvoe.h |
+++ b/talk/media/webrtc/webrtcvoe.h |
@@ -37,6 +37,7 @@ |
#include "webrtc/voice_engine/include/voe_base.h" |
#include "webrtc/voice_engine/include/voe_codec.h" |
#include "webrtc/voice_engine/include/voe_errors.h" |
+#include "webrtc/voice_engine/include/voe_external_media.h" |
#include "webrtc/voice_engine/include/voe_hardware.h" |
#include "webrtc/voice_engine/include/voe_network.h" |
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" |
@@ -89,18 +90,23 @@ class scoped_voe_ptr { |
class VoEWrapper { |
public: |
VoEWrapper() |
- : engine_(webrtc::VoiceEngine::Create()), processing_(engine_), |
- base_(engine_), codec_(engine_), |
- hw_(engine_), network_(engine_), |
- rtp_(engine_), volume_(engine_) { |
- } |
+ : engine_(webrtc::VoiceEngine::Create()), |
+ processing_(engine_), |
+ base_(engine_), |
+ codec_(engine_), |
+ hw_(engine_), |
+ network_(engine_), |
+ rtp_(engine_), |
+ volume_(engine_), |
+ external_media_(engine_) {} |
the sun
2015/12/10 12:36:32
I'm working towards deprecating the old VoE interf
|
VoEWrapper(webrtc::VoEAudioProcessing* processing, |
webrtc::VoEBase* base, |
webrtc::VoECodec* codec, |
webrtc::VoEHardware* hw, |
webrtc::VoENetwork* network, |
webrtc::VoERTP_RTCP* rtp, |
- webrtc::VoEVolumeControl* volume) |
+ webrtc::VoEVolumeControl* volume, |
+ webrtc::VoEExternalMedia* external_media) |
: engine_(NULL), |
processing_(processing), |
base_(base), |
@@ -108,8 +114,8 @@ class VoEWrapper { |
hw_(hw), |
network_(network), |
rtp_(rtp), |
- volume_(volume) { |
- } |
+ volume_(volume), |
+ external_media_(external_media) {} |
~VoEWrapper() {} |
webrtc::VoiceEngine* engine() const { return engine_.get(); } |
webrtc::VoEAudioProcessing* processing() const { return processing_.get(); } |
@@ -119,6 +125,9 @@ class VoEWrapper { |
webrtc::VoENetwork* network() const { return network_.get(); } |
webrtc::VoERTP_RTCP* rtp() const { return rtp_.get(); } |
webrtc::VoEVolumeControl* volume() const { return volume_.get(); } |
+ webrtc::VoEExternalMedia* external_media() const { |
+ return external_media_.get(); |
+ } |
int error() { return base_->LastError(); } |
private: |
@@ -130,6 +139,7 @@ class VoEWrapper { |
scoped_voe_ptr<webrtc::VoENetwork> network_; |
scoped_voe_ptr<webrtc::VoERTP_RTCP> rtp_; |
scoped_voe_ptr<webrtc::VoEVolumeControl> volume_; |
+ scoped_voe_ptr<webrtc::VoEExternalMedia> external_media_; |
}; |
} // namespace cricket |