| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 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 | 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 | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 // classes are allowed to return the same AudioFrame pointer on | 39 // classes are allowed to return the same AudioFrame pointer on |
| 40 // different calls. The pointer must stay valid until the next | 40 // different calls. The pointer must stay valid until the next |
| 41 // mixing call or until this audio source is disconnected from the | 41 // mixing call or until this audio source is disconnected from the |
| 42 // mixer. | 42 // mixer. |
| 43 virtual AudioFrameWithMuted GetAudioFrameWithMuted(int32_t id, | 43 virtual AudioFrameWithMuted GetAudioFrameWithMuted(int32_t id, |
| 44 int sample_rate_hz) = 0; | 44 int sample_rate_hz) = 0; |
| 45 | 45 |
| 46 // Returns true if the participant was mixed this mix iteration. | 46 // Returns true if the participant was mixed this mix iteration. |
| 47 bool IsMixed() const; | 47 bool IsMixed() const; |
| 48 | 48 |
| 49 NewMixHistory* _mixHistory; | 49 NewMixHistory* mix_history_; |
| 50 | 50 |
| 51 protected: | 51 protected: |
| 52 MixerAudioSource(); | 52 MixerAudioSource(); |
| 53 virtual ~MixerAudioSource(); | 53 virtual ~MixerAudioSource(); |
| 54 }; | 54 }; |
| 55 } // namespace webrtc | 55 } // namespace webrtc |
| 56 | 56 |
| 57 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_DEFINES_H_ | 57 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_DEFINES_H_ |
| OLD | NEW |