Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / session / media / call.h

diff --git a/src/third_party/libjingle/source/talk/session/media/call.h b/src/third_party/libjingle/source/talk/session/media/call.h
index 063447a..a81e74a 100644 (file)
--- a/src/third_party/libjingle/source/talk/session/media/call.h
+++ b/src/third_party/libjingle/source/talk/session/media/call.h
@@ -33,7 +33,6 @@
 #include <string>
 #include <vector>
 
-#include "talk/base/messagequeue.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/screencastid.h"
 #include "talk/media/base/streamparams.h"
@@ -45,6 +44,7 @@
 #include "talk/session/media/mediamessages.h"
 #include "talk/session/media/mediasession.h"
 #include "talk/xmpp/jid.h"
+#include "webrtc/base/messagequeue.h"
 
 namespace cricket {
 
@@ -80,7 +80,7 @@ class AudioSourceProxy: public AudioSourceContext, public sigslot::has_slots<> {
   Call* call_;
 };
 
-class Call : public talk_base::MessageHandler, public sigslot::has_slots<> {
+class Call : public rtc::MessageHandler, public sigslot::has_slots<> {
  public:
   explicit Call(MediaSessionClient* session_client);
   ~Call();
@@ -110,12 +110,12 @@ class Call : public talk_base::MessageHandler, public sigslot::has_slots<> {
   void MuteVideo(bool mute);
   bool SendData(Session* session,
                 const SendDataParams& params,
-                const talk_base::Buffer& payload,
+                const rtc::Buffer& payload,
                 SendDataResult* result);
   void PressDTMF(int event);
   bool StartScreencast(Session* session,
                        const std::string& stream_name, uint32 ssrc,
-                       const ScreencastId& screencastid, int fps);
+                       const ScreencastId& screenid, int fps);
   bool StopScreencast(Session* session,
                       const std::string& stream_name, uint32 ssrc);
 
@@ -187,12 +187,12 @@ class Call : public talk_base::MessageHandler, public sigslot::has_slots<> {
                    const MediaStreams&> SignalMediaStreamsUpdate;
   sigslot::signal3<Call*,
                    const ReceiveDataParams&,
-                   const talk_base::Buffer&> SignalDataReceived;
+                   const rtc::Buffer&> SignalDataReceived;
 
   AudioSourceProxy* GetAudioSourceProxy();
 
  private:
-  void OnMessage(talk_base::Message* message);
+  void OnMessage(rtc::Message* message);
   void OnSessionState(BaseSession* base_session, BaseSession::State state);
   void OnSessionError(BaseSession* base_session, Session::Error error);
   void OnSessionInfoMessage(
@@ -219,7 +219,7 @@ class Call : public talk_base::MessageHandler, public sigslot::has_slots<> {
   void OnMediaMonitor(VideoChannel* channel, const VideoMediaInfo& info);
   void OnDataReceived(DataChannel* channel,
                       const ReceiveDataParams& params,
-                      const talk_base::Buffer& payload);
+                      const rtc::Buffer& payload);
   MediaStreams* GetMediaStreams(Session* session) const;
   void UpdateRemoteMediaStreams(Session* session,
                                 const ContentInfos& updated_contents,
@@ -300,7 +300,7 @@ class Call : public talk_base::MessageHandler, public sigslot::has_slots<> {
 
   VoiceMediaInfo last_voice_media_info_;
 
-  talk_base::scoped_ptr<AudioSourceProxy> audio_source_proxy_;
+  rtc::scoped_ptr<AudioSourceProxy> audio_source_proxy_;
 
   friend class MediaSessionClient;
 };