Index: talk/session/media/channelmanager.h |
diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h |
index 81cb3eed61e591e3d8c0b3bc9ac457d8125f496d..118c6e251dd745e122ddb380967c0fe61110e297 100644 |
--- a/talk/session/media/channelmanager.h |
+++ b/talk/session/media/channelmanager.h |
@@ -40,6 +40,9 @@ |
#include "webrtc/base/sigslotrepeater.h" |
#include "webrtc/base/thread.h" |
+namespace webrtc { |
+class MediaController; |
+} |
namespace cricket { |
const int kDefaultAudioDelayOffset = 0; |
@@ -81,6 +84,8 @@ class ChannelManager : public rtc::MessageHandler, |
return true; |
} |
+ MediaEngineInterface* media_engine() { return media_engine_.get(); } |
+ |
// Gets capabilities. Can be called prior to starting the media engine. |
int GetCapabilities(); |
@@ -105,22 +110,17 @@ class ChannelManager : public rtc::MessageHandler, |
VoiceChannel* CreateVoiceChannel(BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
+ webrtc::MediaController* media_controller, |
pthatcher1
2015/09/09 07:27:43
I think it should be the first argument.
the sun
2015/09/09 08:24:51
Done.
|
const AudioOptions& options); |
// Destroys a voice channel created with the Create API. |
- void DestroyVoiceChannel(VoiceChannel* voice_channel, |
- VideoChannel* video_channel); |
- // TODO(pbos): Remove as soon as all call sites specify VideoOptions. |
- VideoChannel* CreateVideoChannel(BaseSession* session, |
- const std::string& content_name, |
- bool rtcp, |
- VoiceChannel* voice_channel); |
+ void DestroyVoiceChannel(VoiceChannel* voice_channel); |
// Creates a video channel, synced with the specified voice channel, and |
// associated with the specified session. |
VideoChannel* CreateVideoChannel(BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
- const VideoOptions& options, |
- VoiceChannel* voice_channel); |
+ webrtc::MediaController* media_controller, |
+ const VideoOptions& options); |
// Destroys a video channel created with the Create API. |
void DestroyVideoChannel(VideoChannel* video_channel); |
DataChannel* CreateDataChannel( |
@@ -250,14 +250,14 @@ class ChannelManager : public rtc::MessageHandler, |
VoiceChannel* CreateVoiceChannel_w(BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
+ webrtc::MediaController* media_controller, |
const AudioOptions& options); |
- void DestroyVoiceChannel_w(VoiceChannel* voice_channel, |
- VideoChannel* video_channel); |
+ void DestroyVoiceChannel_w(VoiceChannel* voice_channel); |
VideoChannel* CreateVideoChannel_w(BaseSession* session, |
const std::string& content_name, |
bool rtcp, |
- const VideoOptions& options, |
- VoiceChannel* voice_channel); |
+ webrtc::MediaController* media_controller, |
+ const VideoOptions& options); |
void DestroyVideoChannel_w(VideoChannel* video_channel); |
DataChannel* CreateDataChannel_w( |
BaseSession* session, const std::string& content_name, |