| Index: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h
|
| diff --git a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h
|
| index b9be6c649def25006094a9da959c39bc4d0ee0bf..29b957dcdfcc767ee1cd3189a6e92212235b3f03 100644
|
| --- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h
|
| +++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h
|
| @@ -17,7 +17,6 @@
|
|
|
| namespace webrtc {
|
| class AudioMixerOutputReceiver;
|
| -class AudioMixerStatusReceiver;
|
| class MixerParticipant;
|
| class Trace;
|
|
|
| @@ -48,12 +47,6 @@ public:
|
| AudioMixerOutputReceiver& receiver) = 0;
|
| virtual int32_t UnRegisterMixedStreamCallback() = 0;
|
|
|
| - // Register/unregister a callback class for receiving status information.
|
| - virtual int32_t RegisterMixerStatusCallback(
|
| - AudioMixerStatusReceiver& mixerStatusCallback,
|
| - const uint32_t amountOf10MsBetweenCallbacks) = 0;
|
| - virtual int32_t UnRegisterMixerStatusCallback() = 0;
|
| -
|
| // Add/remove participants as candidates for mixing.
|
| virtual int32_t SetMixabilityStatus(MixerParticipant& participant,
|
| bool mixable) = 0;
|
|
|