| Index: webrtc/voice_engine/channel.h
|
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
|
| index 2be86be5aa5af91c58e54d71533762236cb0c256..db6ce09246f1cf68c74010c856853813ebad0917 100644
|
| --- a/webrtc/voice_engine/channel.h
|
| +++ b/webrtc/voice_engine/channel.h
|
| @@ -71,7 +71,6 @@ class RtcpRttStatsProxy;
|
| class RtpPacketSenderProxy;
|
| class Statistics;
|
| class TransportFeedbackProxy;
|
| -class TransmitMixer;
|
| class TransportSequenceNumberProxy;
|
| class VoERtcpObserver;
|
|
|
| @@ -155,7 +154,6 @@ class Channel
|
| int32_t Init();
|
| int32_t SetEngineInformation(Statistics& engineStatistics,
|
| OutputMixer& outputMixer,
|
| - TransmitMixer& transmitMixer,
|
| ProcessThread& moduleProcessThread,
|
| AudioDeviceModule& audioDeviceModule,
|
| VoiceEngineObserver* voiceEngineObserver,
|
| @@ -477,7 +475,6 @@ class Channel
|
| // uses
|
| Statistics* _engineStatisticsPtr;
|
| OutputMixer* _outputMixerPtr;
|
| - TransmitMixer* _transmitMixerPtr;
|
| ProcessThread* _moduleProcessThreadPtr;
|
| AudioDeviceModule* _audioDeviceModulePtr;
|
| VoiceEngineObserver* _voiceEngineObserverPtr; // owned by base
|
|
|