| Index: webrtc/voice_engine/transmit_mixer.h
|
| diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h
|
| index 25f02b3bbc8c87226e3938d38eecf6e4419c8213..d7ad473a1a33028e274694e92d774ae40fc33de4 100644
|
| --- a/webrtc/voice_engine/transmit_mixer.h
|
| +++ b/webrtc/voice_engine/transmit_mixer.h
|
| @@ -42,8 +42,7 @@ class ChannelManager;
|
| class MixedAudio;
|
| class Statistics;
|
|
|
| -class TransmitMixer : public MonitorObserver,
|
| - public FileCallback {
|
| +class TransmitMixer : public FileCallback {
|
| public:
|
| static int32_t Create(TransmitMixer*& mixer, uint32_t instanceId);
|
|
|
| @@ -133,10 +132,9 @@ public:
|
|
|
| virtual ~TransmitMixer();
|
|
|
| - // MonitorObserver
|
| + // Periodic callback from the MonitorModule.
|
| void OnPeriodicProcess();
|
|
|
| -
|
| // FileCallback
|
| void PlayNotification(const int32_t id,
|
| const uint32_t durationMs);
|
| @@ -163,7 +161,7 @@ public:
|
| bool IsStereoChannelSwappingEnabled();
|
|
|
| protected:
|
| - TransmitMixer() = default;
|
| + TransmitMixer() : _monitorModule(this) {}
|
|
|
| private:
|
| TransmitMixer(uint32_t instanceId);
|
| @@ -196,7 +194,7 @@ private:
|
| ProcessThread* _processThreadPtr = nullptr;
|
|
|
| // owns
|
| - MonitorModule _monitorModule;
|
| + MonitorModule<TransmitMixer> _monitorModule;
|
| AudioFrame _audioFrame;
|
| PushResampler<int16_t> resampler_; // ADM sample rate -> mixing rate
|
| std::unique_ptr<FilePlayer> file_player_;
|
|
|