Index: talk/session/media/channelmanager.h |
diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h |
index 31fec0e2144c6ab12b3eaaa34e035bb4df043969..3bfef84de2915328c514e3e7d149753557fcbf90 100644 |
--- a/talk/session/media/channelmanager.h |
+++ b/talk/session/media/channelmanager.h |
@@ -105,10 +105,11 @@ |
void Terminate(); |
// The operations below all occur on the worker thread. |
+ |
// Creates a voice channel, to be associated with the specified session. |
VoiceChannel* CreateVoiceChannel( |
webrtc::MediaControllerInterface* media_controller, |
- TransportController* transport_controller, |
+ BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
const AudioOptions& options); |
@@ -118,16 +119,15 @@ |
// associated with the specified session. |
VideoChannel* CreateVideoChannel( |
webrtc::MediaControllerInterface* media_controller, |
- TransportController* transport_controller, |
+ BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
const VideoOptions& options); |
// Destroys a video channel created with the Create API. |
void DestroyVideoChannel(VideoChannel* video_channel); |
- DataChannel* CreateDataChannel(TransportController* transport_controller, |
- const std::string& content_name, |
- bool rtcp, |
- DataChannelType data_channel_type); |
+ DataChannel* CreateDataChannel( |
+ BaseSession* session, const std::string& content_name, |
+ bool rtcp, DataChannelType data_channel_type); |
// Destroys a data channel created with the Create API. |
void DestroyDataChannel(DataChannel* data_channel); |
@@ -251,22 +251,21 @@ |
void Terminate_w(); |
VoiceChannel* CreateVoiceChannel_w( |
webrtc::MediaControllerInterface* media_controller, |
- TransportController* transport_controller, |
+ BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
const AudioOptions& options); |
void DestroyVoiceChannel_w(VoiceChannel* voice_channel); |
VideoChannel* CreateVideoChannel_w( |
webrtc::MediaControllerInterface* media_controller, |
- TransportController* transport_controller, |
+ BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
const VideoOptions& options); |
void DestroyVideoChannel_w(VideoChannel* video_channel); |
- DataChannel* CreateDataChannel_w(TransportController* transport_controller, |
- const std::string& content_name, |
- bool rtcp, |
- DataChannelType data_channel_type); |
+ DataChannel* CreateDataChannel_w( |
+ BaseSession* session, const std::string& content_name, |
+ bool rtcp, DataChannelType data_channel_type); |
void DestroyDataChannel_w(DataChannel* data_channel); |
bool SetAudioOptions_w(const AudioOptions& options, int delay_offset, |
const Device* in_dev, const Device* out_dev); |