| OLD | NEW | 
|---|
| (Empty) |  | 
|  | 1 /* | 
|  | 2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 
|  | 3  * | 
|  | 4  *  Use of this source code is governed by a BSD-style license | 
|  | 5  *  that can be found in the LICENSE file in the root of the source | 
|  | 6  *  tree. An additional intellectual property rights grant can be found | 
|  | 7  *  in the file PATENTS.  All contributing project authors may | 
|  | 8  *  be found in the AUTHORS file in the root of the source tree. | 
|  | 9  */ | 
|  | 10 | 
|  | 11 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h" | 
|  | 12 | 
|  | 13 namespace webrtc { | 
|  | 14 | 
|  | 15 MixerAudioSource::MixerAudioSource() : mix_history_(new NewMixHistory()) {} | 
|  | 16 | 
|  | 17 MixerAudioSource::~MixerAudioSource() {} | 
|  | 18 | 
|  | 19 bool MixerAudioSource::IsMixed() const { | 
|  | 20   return mix_history_->IsMixed(); | 
|  | 21 } | 
|  | 22 | 
|  | 23 NewMixHistory::NewMixHistory() : is_mixed_(0) {} | 
|  | 24 | 
|  | 25 NewMixHistory::~NewMixHistory() {} | 
|  | 26 | 
|  | 27 bool NewMixHistory::IsMixed() const { | 
|  | 28   return is_mixed_; | 
|  | 29 } | 
|  | 30 | 
|  | 31 bool NewMixHistory::WasMixed() const { | 
|  | 32   // Was mixed is the same as is mixed depending on perspective. This function | 
|  | 33   // is for the perspective of NewAudioConferenceMixerImpl. | 
|  | 34   return IsMixed(); | 
|  | 35 } | 
|  | 36 | 
|  | 37 int32_t NewMixHistory::SetIsMixed(const bool mixed) { | 
|  | 38   is_mixed_ = mixed; | 
|  | 39   return 0; | 
|  | 40 } | 
|  | 41 | 
|  | 42 void NewMixHistory::ResetMixedStatus() { | 
|  | 43   is_mixed_ = false; | 
|  | 44 } | 
|  | 45 | 
|  | 46 }  // namespace webrtc | 
| OLD | NEW | 
|---|