Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio…

webrtc/modules/audio_mixer/audio_mixer.h

Index: webrtc/modules/audio_mixer/audio_mixer.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer.h b/webrtc/modules/audio_mixer/audio_mixer.h
index ddcebe56258ae9d89ac862a41c51e64653eb1133..33c90f0285f4b2259807c18b0e3cc5811c47602e 100644
--- a/webrtc/modules/audio_mixer/audio_mixer.h
+++ b/webrtc/modules/audio_mixer/audio_mixer.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.

[tommi, 2016/07/08 12:24:17]

copyright year of files that are not new in this changelist, should not be
changed.

[aleloi, 2016/07/08 12:57:40]

Done.

  *
  *  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
@@ -32,7 +32,7 @@ class Statistics;
 // Note: this class is in the process of being rewritten and merged
 // with AudioConferenceMixer. Expect inheritance chains to be changed,
 // member functions removed or renamed.
-class AudioMixer : public OldAudioMixerOutputReceiver, public FileCallback {
+class AudioMixer : public FileCallback {
  public:
   static int32_t Create(AudioMixer*& mixer, uint32_t instanceId);  // NOLINT
 
@@ -79,12 +79,6 @@ class AudioMixer : public OldAudioMixerOutputReceiver, public FileCallback {
 
   virtual ~AudioMixer();
 
-  // from AudioMixerOutputReceiver
-  virtual void NewMixedAudio(int32_t id,
-                             const AudioFrame& generalAudioFrame,
-                             const AudioFrame** uniqueAudioFrames,
-                             uint32_t size);
-
   // For file recording
   void PlayNotification(int32_t id, uint32_t durationMs);