Remove voe::OutputMixer and AudioConferenceMixer.

voice_engine/output_mixer.h

Index: voice_engine/output_mixer.h
diff --git a/voice_engine/output_mixer.h b/voice_engine/output_mixer.h
deleted file mode 100644
index 284f92d134959bb84391836f33de1151c80d7b89..0000000000000000000000000000000000000000
--- a/voice_engine/output_mixer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  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.
- */
-
-#ifndef VOICE_ENGINE_OUTPUT_MIXER_H_
-#define VOICE_ENGINE_OUTPUT_MIXER_H_
-
-#include <memory>
-
-#include "common_audio/resampler/include/push_resampler.h"
-#include "common_types.h"  // NOLINT(build/include)
-#include "modules/audio_conference_mixer/include/audio_conference_mixer.h"
-#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
-#include "rtc_base/criticalsection.h"
-
-namespace webrtc {
-
-class AudioProcessing;
-class FileWrapper;
-
-namespace voe {
-
-class Statistics;
-
-class OutputMixer : public AudioMixerOutputReceiver
-{
-public:
-    static int32_t Create(OutputMixer*& mixer, uint32_t instanceId);
-
-    static void Destroy(OutputMixer*& mixer);
-
-    int32_t SetEngineInformation(Statistics& engineStatistics);
-
-    int32_t SetAudioProcessingModule(
-        AudioProcessing* audioProcessingModule);
-
-    int32_t MixActiveChannels();
-
-    int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
-
-    int32_t SetMixabilityStatus(MixerParticipant& participant,
-                                bool mixable);
-
-    int GetMixedAudio(int sample_rate_hz, size_t num_channels,
-                      AudioFrame* audioFrame);
-
-    virtual ~OutputMixer();
-
-    // from AudioMixerOutputReceiver
-    virtual void NewMixedAudio(
-        int32_t id,
-        const AudioFrame& generalAudioFrame,
-        const AudioFrame** uniqueAudioFrames,
-        uint32_t size);
-
-private:
-    OutputMixer(uint32_t instanceId);
-
-    // uses
-    Statistics* _engineStatisticsPtr;
-    AudioProcessing* _audioProcessingModulePtr;
-
-    AudioConferenceMixer& _mixerModule;
-    AudioFrame _audioFrame;
-    // Converts mixed audio to the audio device output rate.
-    PushResampler<int16_t> resampler_;
-    // Converts mixed audio to the audio processing rate.
-    PushResampler<int16_t> audioproc_resampler_;
-    int _instanceId;
-    int _mixingFrequencyHz;
-};
-
-}  // namespace voe
-
-}  // namespace werbtc
-
-#endif  // VOICE_ENGINE_OUTPUT_MIXER_H_