Style changes in Audio Mixer

webrtc/modules/audio_mixer/audio_mixer_defines.h

Index: webrtc/modules/audio_mixer/audio_mixer_defines.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer_defines.h b/webrtc/modules/audio_mixer/audio_mixer_defines.h
index b8d7234cf7e6b1d257c7a372065b4839bade705d..74b37d8f41dc22fb2cf74b4f78ad082285a54939 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_defines.h
+++ b/webrtc/modules/audio_mixer/audio_mixer_defines.h
@@ -11,12 +11,34 @@
 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_DEFINES_H_
 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_DEFINES_H_
 
+#include <memory>
+
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
-class NewMixHistory;
+
+class NewMixHistory {
+ public:
+  NewMixHistory();
+  ~NewMixHistory();
+
+  // Returns true if the audio source is being mixed.
+  bool IsMixed() const;
+
+  // Returns true if the audio source was mixed previous mix
+  // iteration.
+  bool WasMixed() const;
+
+  // Updates the mixed status.
+  int32_t SetIsMixed(bool mixed);
+
+  void ResetMixedStatus();
+
+ private:
+  bool is_mixed_;
+};

[aleloi, 2016/09/01 14:12:21]

Moved here from audio_mixer_impl.h

 
 // A callback class that all mixer participants must inherit from/implement.
 class MixerAudioSource {
@@ -46,7 +68,7 @@ class MixerAudioSource {
   // Returns true if the participant was mixed this mix iteration.
   bool IsMixed() const;
 
-  NewMixHistory* mix_history_;
+  std::unique_ptr<NewMixHistory> mix_history_;

[aleloi, 2016/09/01 14:12:21]

Simplifying change suggested by kwiberg@

 
  protected:
   MixerAudioSource();