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

webrtc/modules/audio_mixer/audio_mixer.h

 /*
- *  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
  *  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 WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
@@ skipping 12 matching lines @@
 class AudioProcessing;
 class FileWrapper;
 class VoEMediaProcess;
 
 namespace voe {
 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
 
   static void Destroy(AudioMixer*& mixer);  // NOLINT
 
   int32_t SetEngineInformation(Statistics& engineStatistics);  // NOLINT
 
   int32_t SetAudioProcessingModule(AudioProcessing* audioProcessingModule);
 
   // VoEExternalMedia
@@ skipping 26 matching lines @@
   int GetOutputVolumePan(float& left, float& right);  // NOLINT
 
   // VoEFile
   int StartRecordingPlayout(const char* fileName, const CodecInst* codecInst);
 
   int StartRecordingPlayout(OutStream* stream, const CodecInst* codecInst);
   int StopRecordingPlayout();
 
   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);
 
   void RecordNotification(int32_t id, uint32_t durationMs);
 
   void PlayFileEnded(int32_t id);
   void RecordFileEnded(int32_t id);
 
  private:
   explicit AudioMixer(uint32_t instanceId);
@@ skipping 20 matching lines @@
   int _mixingFrequencyHz;
   FileRecorder* _outputFileRecorderPtr;
   bool _outputFileRecording;
 };
 
 }  // namespace voe
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_