Move VoiceEngineObserver into AudioSendStream so that we detect typing noises and return properly i…

talk/media/base/mediaengine.h

Index: talk/media/base/mediaengine.h
diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index 1a992d7d4a7700470a71ca53f6b5601241a569e1..1258e0e058cf60208d9a94ac0f3f749bf47c9316 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -42,6 +42,7 @@
 #include "talk/media/base/videocommon.h"
 #include "talk/media/base/voiceprocessor.h"
 #include "talk/media/devices/devicemanager.h"
+#include "webrtc/audio_state.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/sigslotrepeater.h"
 
@@ -51,7 +52,6 @@
 
 namespace webrtc {
 class Call;
-class VoiceEngine;
 }
 
 namespace cricket {
@@ -72,7 +72,7 @@ class MediaEngineInterface {
   // Shuts down the engine.
   virtual void Terminate() = 0;
   // TODO(solenberg): Remove once VoE API refactoring is done.
-  virtual webrtc::VoiceEngine* GetVoE() = 0;
+  virtual rtc::linked_ptr<webrtc::AudioState> GetAudioState() const = 0;

[tommi, 2015/11/02 13:46:53]

are there any threading requirements for being allowed to call this method?
(e.g. must be called on the same thread as calls Init() or something along those
lines).

[the sun, 2015/11/03 12:41:07]

No, the returned smart pointer should be thread safe.

 
   // MediaChannel creation
   // Creates a voice media channel. Returns NULL on failure.
@@ -167,8 +167,8 @@ class CompositeMediaEngine : public MediaEngineInterface {
     voice_.Terminate();
   }
 
-  virtual webrtc::VoiceEngine* GetVoE() {
-    return voice_.GetVoE();
+  virtual rtc::linked_ptr<webrtc::AudioState> GetAudioState() const {
+    return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const AudioOptions& options) {