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

webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h

Index: webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
diff --git a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
index f6916409536d5a86e459255f7afcf41122efb7e6..982867076af08a4cf88369f503ab198b77db4d0a 100644
--- a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
+++ b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2016 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
@@ -16,9 +16,7 @@
 #include "webrtc/modules/include/module_common_types.h"
 
 namespace webrtc {
-class OldAudioMixerOutputReceiver;
 class MixerAudioSource;
-class Trace;
 
 class NewAudioConferenceMixer : public Module {
  public:
@@ -40,11 +38,6 @@ class NewAudioConferenceMixer : public Module {
   int64_t TimeUntilNextProcess() override = 0;
   void Process() override = 0;
 
-  // Register/unregister a callback class for receiving the mixed audio.
-  virtual int32_t RegisterMixedStreamCallback(
-      OldAudioMixerOutputReceiver* receiver) = 0;
-  virtual int32_t UnRegisterMixedStreamCallback() = 0;
-
   // Add/remove participants as candidates for mixing.
   virtual int32_t SetMixabilityStatus(MixerAudioSource* participant,
                                       bool mixable) = 0;
@@ -57,15 +50,20 @@ class NewAudioConferenceMixer : public Module {
   // before this function can be successfully called.
   virtual int32_t SetAnonymousMixabilityStatus(MixerAudioSource* participant,
                                                bool mixable) = 0;
-  // Returns true if the participant is mixed anonymously.
-  virtual bool AnonymousMixabilityStatus(
-      const MixerAudioSource& participant) const = 0;
+
+  // Performs mixing by asking registered participants for audio.
+  // The mixed result is placed in the provided AudioFrame.
+  virtual void Mix(AudioFrame* audio_frame_for_mixing) = 0;
 
   // Set the minimum sampling frequency at which to mix. The mixing algorithm
   // may still choose to mix at a higher samling frequency to avoid
   // downsampling of audio contributing to the mixed audio.
   virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0;
 
+  // Returns true if the participant is mixed anonymously.
+  virtual bool AnonymousMixabilityStatus(
+      const MixerAudioSource& participant) const = 0;
+
  protected:
   NewAudioConferenceMixer() {}
 };