Remove Channel::SetRingbackTone() and Channel::PlayRingbackTone(), and the code beneath it (within …

talk/session/media/channel.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1253 matching lines @@
                              media_channel(), ssrc, renderer));
 }
 
 bool VoiceChannel::SetAudioSend(uint32 ssrc, bool mute,
                                 const AudioOptions* options,
                                 AudioRenderer* renderer) {
   return InvokeOnWorker(Bind(&VoiceMediaChannel::SetAudioSend,
                              media_channel(), ssrc, mute, options, renderer));
 }
 
-bool VoiceChannel::SetRingbackTone(const void* buf, int len) {
-  return InvokeOnWorker(Bind(&VoiceChannel::SetRingbackTone_w, this, buf, len));
-}
-
 // TODO(juberti): Handle early media the right way. We should get an explicit
 // ringing message telling us to start playing local ringback, which we cancel
 // if any early media actually arrives. For now, we do the opposite, which is
 // to wait 1 second for early media, and start playing local ringback if none
 // arrives.
 void VoiceChannel::SetEarlyMedia(bool enable) {
   if (enable) {
     // Start the early media timeout
     worker_thread()->PostDelayed(kEarlyMediaTimeout, this,
                                 MSG_EARLYMEDIATIMEOUT);
   } else {
     // Stop the timeout if currently going.
     worker_thread()->Clear(this, MSG_EARLYMEDIATIMEOUT);
   }
 }
 
-bool VoiceChannel::PlayRingbackTone(uint32 ssrc, bool play, bool loop) {
-  return InvokeOnWorker(Bind(&VoiceChannel::PlayRingbackTone_w,
-                             this, ssrc, play, loop));
-}
-
 bool VoiceChannel::PressDTMF(int digit, bool playout) {
   int flags = DF_SEND;
   if (playout) {
     flags |= DF_PLAY;
   }
   int duration_ms = 160;
   return InsertDtmf(0, digit, duration_ms, flags);
 }
 
 bool VoiceChannel::CanInsertDtmf() {
@@ skipping 189 matching lines @@
 
   if (audio->rtp_header_extensions_set()) {
     MaybeCacheRtpAbsSendTimeHeaderExtension(audio->rtp_header_extensions());
   }
 
   set_remote_content_direction(content->direction());
   ChangeState();
   return true;
 }
 
-bool VoiceChannel::SetRingbackTone_w(const void* buf, int len) {
-  ASSERT(worker_thread() == rtc::Thread::Current());
-  return media_channel()->SetRingbackTone(static_cast<const char*>(buf), len);
-}
-
-bool VoiceChannel::PlayRingbackTone_w(uint32 ssrc, bool play, bool loop) {
-  ASSERT(worker_thread() == rtc::Thread::Current());
-  if (play) {
-    LOG(LS_INFO) << "Playing ringback tone, loop=" << loop;
-  } else {
-    LOG(LS_INFO) << "Stopping ringback tone";
-  }
-  return media_channel()->PlayRingbackTone(ssrc, play, loop);
-}
-
 void VoiceChannel::HandleEarlyMediaTimeout() {
   // This occurs on the main thread, not the worker thread.
   if (!received_media_) {
     LOG(LS_INFO) << "No early media received before timeout";
     SignalEarlyMediaTimeout(this);
   }
 }
 
 bool VoiceChannel::InsertDtmf_w(uint32 ssrc, int event, int duration,
                                 int flags) {
@@ skipping 846 matching lines @@
   return (data_channel_type_ == DCT_RTP);
 }
 
 void DataChannel::OnStreamClosedRemotely(uint32 sid) {
   rtc::TypedMessageData<uint32>* message =
       new rtc::TypedMessageData<uint32>(sid);
   signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
 }
 
 }  // namespace cricket