commit d700bef583d29ba2834ae57b3af7e8d3b8306cb9
author aleloi <aleloi@webrtc.org> Mon Aug 15 07:24:05 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Aug 15 14:24:13 2016 +0000
tree 0cbe96c24bf175c07b5f08d4276ef49e8dc08454
parent 963be23e629bbe5cc0c04e5441ec2ce6e8e0e425

Added new mixer to |check_targets| in .gn and fixed include/depend errors.

Also fixed one small chromium-style error in the new mixer.

NOTRY=True

Review-Url: https://codereview.webrtc.org/2234293002
Cr-Commit-Position: refs/heads/master@{#13752}

.gn

diff --git a/.gn b/.gn
index e151f7c..8a173ba 100644
--- a/.gn
+++ b/.gn
@@ -19,7 +19,10 @@
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
 # TODO(kjellander): Keep adding paths to this list as work in webrtc:5589 is done.
-check_targets = [ "//webrtc/voice_engine:level_indicator" ]
+check_targets = [
+  "//webrtc/voice_engine:level_indicator",
+  "//webrtc/modules/audio_mixer:audio_conference_mixer",
+]
 
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly

webrtc/modules/audio_mixer/BUILD.gn

diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn
index 7ef2790..2449c54 100644
--- a/webrtc/modules/audio_mixer/BUILD.gn
+++ b/webrtc/modules/audio_mixer/BUILD.gn
@@ -72,9 +72,11 @@
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../modules/audio_processing",
     "../../modules/utility",
     "../../system_wrappers",
+    "../../system_wrappers:system_wrappers_default",
   ]
 }

webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc

diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
index 5be76ec..48380fc 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
@@ -19,7 +19,6 @@
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/utility.h"
 
 namespace webrtc {
 namespace {
@@ -142,6 +141,8 @@
   thread_checker_.DetachFromThread();
 }
 
+NewAudioConferenceMixerImpl::~NewAudioConferenceMixerImpl() {}
+
 bool NewAudioConferenceMixerImpl::Init() {
   crit_.reset(CriticalSectionWrapper::CreateCriticalSection());
   if (crit_.get() == NULL)

webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
index ef93e6f..3933350 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
@@ -19,7 +19,6 @@
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"
-#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
 #include "webrtc/modules/include/module_common_types.h"
 
 namespace webrtc {
@@ -64,6 +63,8 @@
 
   explicit NewAudioConferenceMixerImpl(int id);
 
+  ~NewAudioConferenceMixerImpl() override;
+
   // Must be called after ctor.
   bool Init();