Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1090)

Unified Diff: webrtc/modules/audio_mixer/audio_mixer_defines.cc

Issue 2401603003: Reland of https://codereview.webrtc.org/2396483002/ (Closed)
Patch Set: Changed LOG macro. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_defines.h ('k') | webrtc/modules/audio_mixer/audio_mixer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index 7779bedfddde7273419b91bac63a96e6d6ecd0d6..0000000000000000000000000000000000000000
--- a/webrtc/modules/audio_mixer/audio_mixer_defines.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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() {}
-
-MixerAudioSource::~MixerAudioSource() {}
-
-bool MixerAudioSource::IsMixed() const {
- return is_mixed_;
-}
-
-bool MixerAudioSource::WasMixed() const {
- // Was mixed is the same as is mixed depending on perspective. This function
- // is for the perspective of AudioMixerImpl.
- return IsMixed();
-}
-
-int32_t MixerAudioSource::SetIsMixed(const bool mixed) {
- is_mixed_ = mixed;
- return 0;
-}
-
-void MixerAudioSource::ResetMixedStatus() {
- is_mixed_ = false;
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_defines.h ('k') | webrtc/modules/audio_mixer/audio_mixer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698