Remove WVoE::SetAudioDeviceModule() - it is now set in ctor.

webrtc/media/base/mediaengine.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/mediacommon.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocommon.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 #define DISABLE_MEDIA_ENGINE_FACTORY
 #endif
 
 namespace webrtc {
+class AudioDeviceModule;
 class Call;
 }
 
 namespace cricket {
 
 class VideoCapturer;
 
 struct RtpCapabilities {
   std::vector<RtpHeaderExtension> header_extensions;
 };
 
 // MediaEngineInterface is an abstraction of a media engine which can be
 // subclassed to support different media componentry backends.
 // It supports voice and video operations in the same class to facilitate
 // proper synchronization between both media types.
 class MediaEngineInterface {
  public:
   virtual ~MediaEngineInterface() {}
 
   // Initialization
   // Starts the engine.
-  virtual bool Init(rtc::Thread* worker_thread) = 0;
-  // Shuts down the engine.
-  virtual void Terminate() = 0;
+  virtual bool Init() = 0;
   // TODO(solenberg): Remove once VoE API refactoring is done.
   virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const = 0;
 
   // MediaChannel creation
   // Creates a voice media channel. Returns NULL on failure.
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const MediaConfig& config,
                                            const AudioOptions& options) = 0;
   // Creates a video media channel, paired with the specified voice channel.
   // Returns NULL on failure.
@@ skipping 48 matching lines @@
  private:
   static MediaEngineCreateFunction create_function_;
 };
 #endif
 
 // CompositeMediaEngine constructs a MediaEngine from separate
 // voice and video engine classes.
 template<class VOICE, class VIDEO>
 class CompositeMediaEngine : public MediaEngineInterface {
  public:
+  explicit CompositeMediaEngine(webrtc::AudioDeviceModule* adm) : voice_(adm) {}
   virtual ~CompositeMediaEngine() {}
-  virtual bool Init(rtc::Thread* worker_thread) {
-    if (!voice_.Init(worker_thread))
-      return false;
+  virtual bool Init() {
     video_.Init();
     return true;
   }
-  virtual void Terminate() {
-    voice_.Terminate();
-  }
 
   virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const {
     return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const MediaConfig& config,
                                            const AudioOptions& options) {
     return voice_.CreateChannel(call, config, options);
   }
   virtual VideoMediaChannel* CreateVideoChannel(webrtc::Call* call,
@@ skipping 55 matching lines @@
   virtual ~DataEngineInterface() {}
   virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
   virtual const std::vector<DataCodec>& data_codecs() = 0;
 };
 
 webrtc::RtpParameters CreateRtpParametersWithOneEncoding();
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_