Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: webrtc/voice_engine/transmit_mixer.h

Issue 2722613002: Simplify webrtc::voe::MonitorModule and remove the .cc file. (Closed)
Patch Set: Add TODO Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/monitor_module.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « webrtc/voice_engine/monitor_module.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698