Style changes in Audio Mixer

webrtc/modules/audio_mixer/audio_mixer_impl.cc

Index: webrtc/modules/audio_mixer/audio_mixer_impl.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
index 82932f40955d4e1d96bf1ae4fd24bc863a343763..8d8c74a538e8ddabe0e9bdc9d55e89efeff19de7 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
@@ -16,9 +16,7 @@
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h"

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

Duplicate between .cc and .h

-#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

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

Shouldn't include headers in .cc file that are duplicated in accompanying .h
file

 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
@@ -97,39 +95,6 @@ void Ramp(const std::vector<SourceFrame>& mixed_sources_and_frames) {
 
 }  // namespace
 
-MixerAudioSource::MixerAudioSource() : mix_history_(new NewMixHistory()) {}
-
-MixerAudioSource::~MixerAudioSource() {
-  delete mix_history_;
-}
-
-bool MixerAudioSource::IsMixed() const {
-  return mix_history_->IsMixed();
-}
-
-NewMixHistory::NewMixHistory() : is_mixed_(0) {}
-
-NewMixHistory::~NewMixHistory() {}
-
-bool NewMixHistory::IsMixed() const {
-  return is_mixed_;
-}
-
-bool NewMixHistory::WasMixed() const {
-  // Was mixed is the same as is mixed depending on perspective. This function
-  // is for the perspective of NewAudioConferenceMixerImpl.
-  return IsMixed();
-}
-
-int32_t NewMixHistory::SetIsMixed(const bool mixed) {
-  is_mixed_ = mixed;
-  return 0;
-}
-
-void NewMixHistory::ResetMixedStatus() {
-  is_mixed_ = false;
-}
-
 std::unique_ptr<AudioMixer> AudioMixer::Create(int id) {
   AudioMixerImpl* mixer = new AudioMixerImpl(id);
   if (!mixer->Init()) {