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

Unified Diff: talk/media/base/fakemediaengine.h

Issue 1362913004: Remove unused SignalMediaError and infrastructure. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: more Created 5 years, 3 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 | « no previous file | talk/media/base/mediachannel.h » ('j') | talk/session/media/channel_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/fakemediaengine.h
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index b53c645f75ef7ccfa26c5bf0a398ae8ecf2bee14..bcbdb7a4ecc96f1baef5c2860fee3bc060dd7c36 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -240,7 +240,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
explicit FakeVoiceMediaChannel(FakeVoiceEngine* engine,
const AudioOptions& options)
: engine_(engine),
- fail_set_send_(false),
time_since_last_typing_(-1) {
output_scalings_[0] = OutputScaling(); // For default channel.
SetOptions(options);
@@ -270,9 +269,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
return true;
}
virtual bool SetSend(SendFlags flag) {
- if (fail_set_send_) {
- return false;
- }
return set_sending(flag != SEND_NOTHING);
}
virtual bool SetAudioSend(uint32 ssrc, bool mute,
@@ -370,17 +366,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
}
virtual bool GetStats(VoiceMediaInfo* info) { return false; }
- virtual void GetLastMediaError(uint32* ssrc,
- VoiceMediaChannel::Error* error) {
- *ssrc = 0;
- *error = fail_set_send_ ? VoiceMediaChannel::ERROR_REC_DEVICE_OPEN_FAILED
- : VoiceMediaChannel::ERROR_NONE;
- }
-
- void set_fail_set_send(bool fail) { fail_set_send_ = fail; }
- void TriggerError(uint32 ssrc, VoiceMediaChannel::Error error) {
- VoiceMediaChannel::SignalMediaError(ssrc, error);
- }
private:
struct OutputScaling {
@@ -458,7 +443,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
std::vector<AudioCodec> send_codecs_;
std::map<uint32, OutputScaling> output_scalings_;
std::vector<DtmfInfo> dtmf_info_queue_;
- bool fail_set_send_;
int time_since_last_typing_;
AudioOptions options_;
std::map<uint32, VoiceChannelAudioSink*> local_renderers_;
« no previous file with comments | « no previous file | talk/media/base/mediachannel.h » ('j') | talk/session/media/channel_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698