Remove media sinks from Channel.

talk/session/media/channel.h

 /*
  * 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 130 matching lines @@
   // Monitoring
   void StartConnectionMonitor(int cms);
   void StopConnectionMonitor();
   // For ConnectionStatsGetter, used by ConnectionMonitor
   virtual bool GetConnectionStats(ConnectionInfos* infos) override;
 
   void set_srtp_signal_silent_time(uint32 silent_time) {
     srtp_filter_.set_signal_silent_time(silent_time);
   }
 
-  template <class T>
-  void RegisterSendSink(T* sink,
-                        void (T::*OnPacket)(const void*, size_t, bool),
-                        SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalSendPacketPostCrypto.disconnect(sink);
-      SignalSendPacketPostCrypto.connect(sink, OnPacket);
-    } else {
-      SignalSendPacketPreCrypto.disconnect(sink);
-      SignalSendPacketPreCrypto.connect(sink, OnPacket);
-    }
-  }
-
-  void UnregisterSendSink(sigslot::has_slots<>* sink,
-                          SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalSendPacketPostCrypto.disconnect(sink);
-    } else {
-      SignalSendPacketPreCrypto.disconnect(sink);
-    }
-  }
-
-  bool HasSendSinks(SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      return !SignalSendPacketPostCrypto.is_empty();
-    } else {
-      return !SignalSendPacketPreCrypto.is_empty();
-    }
-  }
-
-  template <class T>
-  void RegisterRecvSink(T* sink,
-                        void (T::*OnPacket)(const void*, size_t, bool),
-                        SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalRecvPacketPostCrypto.disconnect(sink);
-      SignalRecvPacketPostCrypto.connect(sink, OnPacket);
-    } else {
-      SignalRecvPacketPreCrypto.disconnect(sink);
-      SignalRecvPacketPreCrypto.connect(sink, OnPacket);
-    }
-  }
-
-  void UnregisterRecvSink(sigslot::has_slots<>* sink,
-                          SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalRecvPacketPostCrypto.disconnect(sink);
-    } else {
-      SignalRecvPacketPreCrypto.disconnect(sink);
-    }
-  }
-
-  bool HasRecvSinks(SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      return !SignalRecvPacketPostCrypto.is_empty();
-    } else {
-      return !SignalRecvPacketPreCrypto.is_empty();
-    }
-  }
-
   BundleFilter* bundle_filter() { return &bundle_filter_; }
 
   const std::vector<StreamParams>& local_streams() const {
     return local_streams_;
   }
   const std::vector<StreamParams>& remote_streams() const {
     return remote_streams_;
   }
 
   sigslot::signal2<BaseChannel*, bool> SignalDtlsSetupFailure;
@@ skipping 143 matching lines @@
   virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor,
       const std::vector<ConnectionInfo>& infos) = 0;
 
   // Helper function for invoking bool-returning methods on the worker thread.
   template <class FunctorT>
   bool InvokeOnWorker(const FunctorT& functor) {
     return worker_thread_->Invoke<bool>(functor);
   }
 
  private:
-  sigslot::signal3<const void*, size_t, bool> SignalSendPacketPreCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalSendPacketPostCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalRecvPacketPreCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalRecvPacketPostCrypto;
-  rtc::CriticalSection signal_send_packet_cs_;
-  rtc::CriticalSection signal_recv_packet_cs_;
-
   rtc::Thread* worker_thread_;
   MediaEngineInterface* media_engine_;
   BaseSession* session_;
   MediaChannel* media_channel_;
   std::vector<StreamParams> local_streams_;
   std::vector<StreamParams> remote_streams_;
 
   const std::string content_name_;
   bool rtcp_;
   TransportChannel* transport_channel_;
@@ skipping 330 matching lines @@
   rtc::scoped_ptr<DataMediaMonitor> media_monitor_;
   // TODO(pthatcher): Make a separate SctpDataChannel and
   // RtpDataChannel instead of using this.
   DataChannelType data_channel_type_;
   bool ready_to_send_data_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNEL_H_