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

webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

Index: webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
index 322e45229f5f99c4e551d724ddacc9739d72821a..a055f6b85d25e460f3ceacef6c72e812ae248631 100644
--- a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
@@ -72,9 +72,7 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
   void Process() override;
 
   // NewAudioConferenceMixer functions
-  int32_t RegisterMixedStreamCallback(
-      OldAudioMixerOutputReceiver* mixReceiver) override;
-  int32_t UnRegisterMixedStreamCallback() override;
+  void Mix(AudioFrame*) override;

[tommi, 2016/07/06 19:42:17]

add param name

[aleloi, 2016/07/07 09:20:16]

Done.

[ivoc, 2016/07/07 13:46:16]

Try to keep the order of the functions the same as in the
new_audio_conference_mixer.h header.

[aleloi, 2016/07/07 14:29:12]

Done.

   int32_t SetMixabilityStatus(MixerAudioSource* participant,
                               bool mixable) override;
   bool MixabilityStatus(const MixerAudioSource& participant) const override;
@@ -151,9 +149,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
 
   Frequency _minimumMixingFreq;
 
-  // Mix result callback
-  OldAudioMixerOutputReceiver* _mixReceiver;
-
   // The current sample frequency and sample size when mixing.
   Frequency _outputFrequency;
   size_t _sampleSize;