Remove voe::OutputMixer and AudioConferenceMixer.

voice_engine/shared_data.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 #include "voice_engine/shared_data.h"
 
 #include "modules/audio_processing/include/audio_processing.h"
 #include "system_wrappers/include/trace.h"
 #include "voice_engine/channel.h"
-#include "voice_engine/output_mixer.h"
 #include "voice_engine/transmit_mixer.h"
 
 namespace webrtc {
 
 namespace voe {
 
 static int32_t _gInstanceCounter = 0;
 
 SharedData::SharedData()
     : _instanceId(++_gInstanceCounter),
       _channelManager(_gInstanceCounter),
       _engineStatistics(_gInstanceCounter),
       _audioDevicePtr(NULL),
       _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")),
       encoder_queue_("AudioEncoderQueue") {
   Trace::CreateTrace();
-  if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) {
-    _outputMixerPtr->SetEngineInformation(_engineStatistics);
-  }
   if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) {
     _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
                                             _engineStatistics, _channelManager);
   }
 }
 
 SharedData::~SharedData()
 {
-    OutputMixer::Destroy(_outputMixerPtr);
     TransmitMixer::Destroy(_transmitMixerPtr);
     if (_audioDevicePtr) {
         _audioDevicePtr->Release();
     }
     _moduleProcessThreadPtr->Stop();
     Trace::ReturnTrace();
 }
 
 rtc::TaskQueue* SharedData::encoder_queue() {
   RTC_DCHECK_RUN_ON(&construction_thread_);
   return &encoder_queue_;
 }
 
 void SharedData::set_audio_device(
     const rtc::scoped_refptr<AudioDeviceModule>& audio_device) {
   _audioDevicePtr = audio_device;
 }
 
 void SharedData::set_audio_processing(AudioProcessing* audioproc) {
   _transmitMixerPtr->SetAudioProcessingModule(audioproc);
-  _outputMixerPtr->SetAudioProcessingModule(audioproc);
 }
 
 int SharedData::NumOfSendingChannels() {
   ChannelManager::Iterator it(&_channelManager);
   int sending_channels = 0;
 
   for (ChannelManager::Iterator it(&_channelManager); it.IsValid();
        it.Increment()) {
     if (it.GetChannel()->Sending())
       ++sending_channels;
@@ skipping 25 matching lines @@
 }
 
 void SharedData::SetLastError(int32_t error, TraceLevel level,
                               const char* msg) const {
   _engineStatistics.SetLastError(error, level, msg);
 }
 
 }  // namespace voe
 
 }  // namespace webrtc