Index: webrtc/modules/audio_mixer/audio_mixer_defines.cc |
diff --git a/webrtc/modules/audio_mixer/audio_mixer_defines.cc b/webrtc/modules/audio_mixer/audio_mixer_defines.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..0880dcf8773b11eeaae1ac5e3a62c3b03ffb257f |
--- /dev/null |
+++ b/webrtc/modules/audio_mixer/audio_mixer_defines.cc |
@@ -0,0 +1,46 @@ |
+/* |
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
+ * |
+ * Use of this source code is governed by a BSD-style license |
+ * that can be found in the LICENSE file in the root of the source |
+ * tree. An additional intellectual property rights grant can be found |
+ * in the file PATENTS. All contributing project authors may |
+ * be found in the AUTHORS file in the root of the source tree. |
+ */ |
+ |
+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h" |
+ |
+namespace webrtc { |
+ |
+MixerAudioSource::MixerAudioSource() : mix_history_(new NewMixHistory()) {} |
+ |
+MixerAudioSource::~MixerAudioSource() {} |
+ |
+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; |
+} |
+ |
+} // namespace webrtc |
aleloi
2016/09/01 14:12:21
Implementation moved here from audio_mixer_impl.cc
|