Index: webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h |
diff --git a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h |
index d3a614cce12958f018411d3a4d61c98dcaeb9808..2016fd478bc3a9a2a3754454487257c0b61aad63 100644 |
--- a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h |
+++ b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h |
@@ -18,7 +18,7 @@ |
namespace webrtc { |
class MixerAudioSource; |
-class NewAudioConferenceMixer : public Module { |
+class NewAudioConferenceMixer { |
public: |
enum { kMaximumAmountOfMixedParticipants = 3 }; |
enum Frequency { |
@@ -34,10 +34,6 @@ class NewAudioConferenceMixer : public Module { |
static NewAudioConferenceMixer* Create(int id); |
virtual ~NewAudioConferenceMixer() {} |
- // Module functions |
- int64_t TimeUntilNextProcess() override = 0; |
- void Process() override = 0; |
- |
// Add/remove participants as candidates for mixing. |
virtual int32_t SetMixabilityStatus(MixerAudioSource* participant, |
bool mixable) = 0; |
@@ -56,7 +52,7 @@ class NewAudioConferenceMixer : public Module { |
// Performs mixing by asking registered participants for audio. |
// The mixed result is placed in the provided AudioFrame. |
- virtual void Mix(AudioFrame*) = 0; |
+ virtual void Mix(AudioFrame* audio_frame_for_mixing) = 0; |
// Set the minimum sampling frequency at which to mix. The mixing algorithm |
// may still choose to mix at a higher samling frequency to avoid |