Changed ramping functionality of the AudioMixer.

webrtc/modules/audio_mixer/audio_mixer_impl.h

Index: webrtc/modules/audio_mixer/audio_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h
index 5b945a1c66d0a87ebed4fc12ba3b67112cdbb9db..339380fe913b135020815a38b45b544366e8bd80 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h
@@ -18,7 +18,6 @@
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
-#include "webrtc/modules/audio_mixer/audio_source_with_mix_status.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
@@ -28,10 +27,19 @@
 namespace webrtc {
 
 typedef std::vector<AudioFrame*> AudioFrameList;
-typedef std::vector<AudioSourceWithMixStatus> MixerAudioSourceList;
 
 class AudioMixerImpl : public AudioMixer {
  public:
+  struct SourceStatus {
+    SourceStatus(Source* audio_source, bool is_mixed, float gain)
+        : audio_source_(audio_source), is_mixed_(is_mixed), gain_(gain) {}
+    Source* audio_source_ = nullptr;

[hlundin-webrtc, 2016/10/07 15:03:10]

Structs don't have trailing underscore on the member names.
https://google.github.io/styleguide/cppguide.html#Variable_Names

[aleloi, 2016/10/10 10:58:17]

Thanks! I think I should re-read the style guide again.

+    bool is_mixed_ = false;
+    float gain_ = 0;
+  };
+
+  typedef std::vector<SourceStatus> MixerAudioSourceList;

[hlundin-webrtc, 2016/10/07 15:03:10]

How about SourceStatusList?

[aleloi, 2016/10/10 10:58:17]

Done.

+
   // AudioProcessing only accepts 10 ms frames.
   static const int kFrameDurationInMs = 10;