| Index: webrtc/media/base/mediachannel.h
|
| diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
|
| index bab72b21926654ad0fb55c559787f717cdaf224c..2b064cd9f19a9899de371bcf8260485ac7a09f6c 100644
|
| --- a/webrtc/media/base/mediachannel.h
|
| +++ b/webrtc/media/base/mediachannel.h
|
| @@ -42,7 +42,7 @@ class AudioSinkInterface;
|
|
|
| namespace cricket {
|
|
|
| -class AudioRenderer;
|
| +class AudioSource;
|
| class ScreencastId;
|
| class VideoCapturer;
|
| class VideoFrame;
|
| @@ -448,11 +448,6 @@ class MediaChannel : public sigslot::has_slots<> {
|
| NetworkInterface* network_interface_;
|
| };
|
|
|
| -enum SendFlags {
|
| - SEND_NOTHING,
|
| - SEND_MICROPHONE
|
| -};
|
| -
|
| // The stats information is structured as follows:
|
| // Media are represented by either MediaSenderInfo or MediaReceiverInfo.
|
| // Media contains a vector of SSRC infos that are exclusively used by this
|
| @@ -901,12 +896,12 @@ class VoiceMediaChannel : public MediaChannel {
|
| // Starts or stops playout of received audio.
|
| virtual bool SetPlayout(bool playout) = 0;
|
| // Starts or stops sending (and potentially capture) of local audio.
|
| - virtual bool SetSend(SendFlags flag) = 0;
|
| + virtual bool SetSend(bool send) = 0;
|
| // Configure stream for sending.
|
| virtual bool SetAudioSend(uint32_t ssrc,
|
| bool enable,
|
| const AudioOptions* options,
|
| - AudioRenderer* renderer) = 0;
|
| + AudioSource* source) = 0;
|
| // Gets current energy levels for all incoming streams.
|
| virtual bool GetActiveStreams(AudioInfo::StreamList* actives) = 0;
|
| // Get the current energy level of the stream sent to the speaker.
|
|
|