| Index: talk/media/base/fakemediaengine.h
|
| diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
|
| index 3c48aed8df4719e8e8a842dbd630c375030a760c..96d552191cd2985d1c20779d6239099870142fad 100644
|
| --- a/talk/media/base/fakemediaengine.h
|
| +++ b/talk/media/base/fakemediaengine.h
|
| @@ -241,9 +241,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
|
| const AudioOptions& options)
|
| : engine_(engine),
|
| fail_set_send_(false),
|
| - ringback_tone_ssrc_(0),
|
| - ringback_tone_play_(false),
|
| - ringback_tone_loop_(false),
|
| time_since_last_typing_(-1) {
|
| output_scalings_[0] = OutputScaling(); // For default channel.
|
| SetOptions(options);
|
| @@ -257,10 +254,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
|
| }
|
| const AudioOptions& options() const { return options_; }
|
|
|
| - uint32 ringback_tone_ssrc() const { return ringback_tone_ssrc_; }
|
| - bool ringback_tone_play() const { return ringback_tone_play_; }
|
| - bool ringback_tone_loop() const { return ringback_tone_loop_; }
|
| -
|
| virtual bool SetSendParameters(const AudioSendParameters& params) {
|
| return (SetSendCodecs(params.codecs) &&
|
| SetSendRtpHeaderExtensions(params.extensions) &&
|
| @@ -337,14 +330,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
|
| int time_window, int cost_per_typing, int reporting_threshold,
|
| int penalty_decay, int type_event_delay) {}
|
|
|
| - virtual bool SetRingbackTone(const char* buf, int len) { return true; }
|
| - virtual bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) {
|
| - ringback_tone_ssrc_ = ssrc;
|
| - ringback_tone_play_ = play;
|
| - ringback_tone_loop_ = loop;
|
| - return true;
|
| - }
|
| -
|
| virtual bool CanInsertDtmf() {
|
| for (std::vector<AudioCodec>::const_iterator it = send_codecs_.begin();
|
| it != send_codecs_.end(); ++it) {
|
| @@ -474,9 +459,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
|
| std::map<uint32, OutputScaling> output_scalings_;
|
| std::vector<DtmfInfo> dtmf_info_queue_;
|
| bool fail_set_send_;
|
| - uint32 ringback_tone_ssrc_;
|
| - bool ringback_tone_play_;
|
| - bool ringback_tone_loop_;
|
| int time_since_last_typing_;
|
| AudioOptions options_;
|
| std::map<uint32, VoiceChannelAudioSink*> local_renderers_;
|
|
|