| Index: webrtc/modules/audio_mixer/include/audio_conference_mixer.h
|
| diff --git a/webrtc/modules/audio_mixer/include/audio_conference_mixer.h b/webrtc/modules/audio_mixer/include/audio_conference_mixer.h
|
| index 111579c7a9291383cf1d3e8cb200a32765cc63e0..ad2c14740e8e846ee5b21c1d243dcc6d820ce449 100644
|
| --- a/webrtc/modules/audio_mixer/include/audio_conference_mixer.h
|
| +++ b/webrtc/modules/audio_mixer/include/audio_conference_mixer.h
|
| @@ -19,7 +19,7 @@ namespace webrtc {
|
| class AudioMixerOutputReceiver;
|
| class MixerAudioSource;
|
|
|
| -class NewAudioConferenceMixer : public Module {
|
| +class NewAudioConferenceMixer {
|
| public:
|
| enum { kMaximumAmountOfMixedParticipants = 3 };
|
| enum Frequency {
|
| @@ -35,10 +35,6 @@ class NewAudioConferenceMixer : public Module {
|
| static NewAudioConferenceMixer* Create(int id);
|
| virtual ~NewAudioConferenceMixer() {}
|
|
|
| - // Module functions
|
| - int64_t TimeUntilNextProcess() override = 0;
|
| - void Process() override = 0;
|
| -
|
| // Register/unregister a callback class for receiving the mixed audio.
|
| virtual int32_t RegisterMixedStreamCallback(
|
| AudioMixerOutputReceiver* receiver) = 0;
|
|
|