webrtc/modules/audio_mixer/audio_source_with_mix_status.cc - Issue 2396803004: Moved MixerAudioSource and removed audio_mixer_defines.h.

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/audio_source_with_mix_status.cc

Issue 2396803004: Moved MixerAudioSource and removed audio_mixer_defines.h. (Closed)

Patch Set: Renamed AudioFrameWithMuted to AudioFrameWithInfo and changed RemixFrame argument order. Created 4 years, 2 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:

Index: webrtc/modules/audio_mixer/audio_source_with_mix_status.cc

diff --git a/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc b/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc

index 40ccad4ad7d72e8e0a9f191dbb91ea8b53dd4718..db94887ad932d475854b9f38bbb485f558ed3eb1 100644

--- a/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc

+++ b/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc

@@ -13,7 +13,7 @@

namespace webrtc {

AudioSourceWithMixStatus::AudioSourceWithMixStatus(

- MixerAudioSource* audio_source)

+ AudioMixer::Source* audio_source)

: audio_source_(audio_source) {}

AudioSourceWithMixStatus::~AudioSourceWithMixStatus() {}

@@ -36,7 +36,7 @@ void AudioSourceWithMixStatus::ResetMixedStatus() {

is_mixed_ = false;

}

-MixerAudioSource* AudioSourceWithMixStatus::audio_source() const {

+AudioMixer::Source* AudioSourceWithMixStatus::audio_source() const {

return audio_source_;

}