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

webrtc/modules/audio_mixer/audio_mixer.gypi

Index: webrtc/modules/audio_mixer/audio_mixer.gypi
diff --git a/webrtc/modules/audio_mixer/audio_mixer.gypi b/webrtc/modules/audio_mixer/audio_mixer.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..055d7bd83d04a958ecb36262fa7aad844dc2c7d9
--- /dev/null
+++ b/webrtc/modules/audio_mixer/audio_mixer.gypi
@@ -0,0 +1,40 @@
+# 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
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'new_audio_conference_mixer',
+      'type': 'static_library',
+      'dependencies': [
+        'audio_processing',
+        'webrtc_utility',
+        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+      ],
+      'sources': [
+        'include/new_audio_conference_mixer.h',
+        'include/audio_mixer_defines.h',
+        'source/new_audio_conference_mixer_impl.cc',
+        'source/new_audio_conference_mixer_impl.h',
+      ],
+    },
+    {
+      'target_name': 'audio_mixer',
+      'type': 'static_library',
+      'dependencies': [
+        'new_audio_conference_mixer',
+        'webrtc_utility',
+        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+      ],
+      'sources': [
+        'audio_mixer.h',
+        'audio_mixer.cc',
+      ],
+    },
+  ], # targets
+}