webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h - Issue 2234293002: Added new mixer to |check_targets| in .gn and fixed include/depend errors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h

Issue 2234293002: Added new mixer to |check_targets| in .gn and fixed include/depend errors. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer_dir_structure_comments

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/modules/audio_mixer/BUILD.gn ('K') | « webrtc/modules/audio_mixer/BUILD.gn ('k') | webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: 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 ef93e6ff914f49314f32befc83d8b9b6670323a2..3933350fed0a593af4425d1b898e32765753bb74 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 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {

explicit NewAudioConferenceMixerImpl(int id);

+ ~NewAudioConferenceMixerImpl() override;

aleloi 2016/08/11 08:09:39 Added explicit destructor because of chromium-styl

// Must be called after ctor.

bool Init();

« webrtc/modules/audio_mixer/BUILD.gn ('K') | « webrtc/modules/audio_mixer/BUILD.gn ('k') | webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc » ('j') | no next file with comments »