generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move xmpp and p2p to webrtc

Browse Source 
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.

BUG=3379

Review URL: https://webrtc-codereview.appspot.com/26999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-10-28 22:20:11 +00:00
parent 8b1b23f8f8
commit 269fb4bc90
465 changed files with 61160 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/examples/call/call_main.cc
View File

@@ -41,13 +41,13 @@
#include "talk/examples/call/callclient.h"
#include "talk/examples/call/console.h"
#include "talk/examples/call/mediaenginefactory.h"
#include "talk/p2p/base/constants.h"
#include "webrtc/p2p/base/constants.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/session/media/srtpfilter.h"
#include "talk/xmpp/xmppauth.h"
#include "talk/xmpp/xmppclientsettings.h"
#include "talk/xmpp/xmpppump.h"
#include "talk/xmpp/xmppsocket.h"
#include "webrtc/libjingle/xmpp/xmppauth.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "webrtc/libjingle/xmpp/xmpppump.h"
#include "webrtc/libjingle/xmpp/xmppsocket.h"
#include "webrtc/base/pathutils.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/base/stream.h"

18
talk/examples/call/callclient.cc
View File

@@ -53,17 +53,17 @@
#include "talk/media/base/videorenderer.h"
#include "talk/media/devices/devicemanager.h"
#include "talk/media/devices/videorendererfactory.h"
#include "talk/p2p/base/sessionmanager.h"
#include "talk/p2p/client/basicportallocator.h"
#include "talk/p2p/client/sessionmanagertask.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/client/basicportallocator.h"
#include "webrtc/p2p/client/sessionmanagertask.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/xmpp/constants.h"
#include "talk/xmpp/hangoutpubsubclient.h"
#include "talk/xmpp/mucroomconfigtask.h"
#include "talk/xmpp/mucroomlookuptask.h"
#include "talk/xmpp/pingtask.h"
#include "talk/xmpp/presenceouttask.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
#include "webrtc/libjingle/xmpp/mucroomconfigtask.h"
#include "webrtc/libjingle/xmpp/mucroomlookuptask.h"
#include "webrtc/libjingle/xmpp/pingtask.h"
#include "webrtc/libjingle/xmpp/presenceouttask.h"
namespace {

8
talk/examples/call/callclient.h
View File

@@ -34,12 +34,12 @@
#include "talk/examples/call/console.h"
#include "talk/media/base/mediachannel.h"
#include "talk/p2p/base/session.h"
#include "webrtc/p2p/base/session.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/xmpp/hangoutpubsubclient.h"
#include "talk/xmpp/presencestatus.h"
#include "talk/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
#include "webrtc/libjingle/xmpp/presencestatus.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sslidentity.h"

2
talk/examples/call/callclient_unittest.cc
View File

@@ -30,7 +30,7 @@
#include "talk/examples/call/callclient.h"
#include "talk/media/base/filemediaengine.h"
#include "talk/media/base/mediaengine.h"
#include "talk/xmpp/xmppthread.h"
#include "webrtc/libjingle/xmpp/xmppthread.h"
#include "webrtc/base/gunit.h"
TEST(CallClientTest, CreateCallClientWithDefaultMediaEngine) {

2
talk/examples/call/friendinvitesendtask.cc
View File

@@ -26,7 +26,7 @@
*/
#include "talk/examples/call/friendinvitesendtask.h"
#include "talk/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/constants.h"
namespace buzz {

4
talk/examples/call/friendinvitesendtask.h
View File

@@ -28,8 +28,8 @@
#ifndef _FRIENDINVITESENDTASK_H_
#define _FRIENDINVITESENDTASK_H_
#include "talk/xmpp/xmppengine.h"
#include "talk/xmpp/xmpptask.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
namespace buzz {

4
talk/examples/call/muc.h
View File

@@ -29,8 +29,8 @@
#define _MUC_H_
#include <map>
#include "talk/xmpp/jid.h"
#include "talk/xmpp/presencestatus.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/libjingle/xmpp/presencestatus.h"
namespace buzz {

2
talk/examples/call/mucinviterecvtask.cc
View File

@@ -26,7 +26,7 @@
*/
#include "talk/examples/call/mucinviterecvtask.h"
#include "talk/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/constants.h"
namespace buzz {

4
talk/examples/call/mucinviterecvtask.h
View File

@@ -30,8 +30,8 @@
#include <vector>
#include "talk/xmpp/xmppengine.h"
#include "talk/xmpp/xmpptask.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "webrtc/base/sigslot.h"
namespace buzz {

4
talk/examples/call/mucinvitesendtask.cc
View File

@@ -26,8 +26,8 @@
*/
#include "talk/examples/call/mucinvitesendtask.h"
#include "talk/xmpp/constants.h"
#include "talk/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
namespace buzz {

4
talk/examples/call/mucinvitesendtask.h
View File

@@ -29,8 +29,8 @@
#define _MUCINVITESENDTASK_H_
#include "talk/examples/call/muc.h"
#include "talk/xmpp/xmppengine.h"
#include "talk/xmpp/xmpptask.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
namespace buzz {

2
talk/examples/call/presencepushtask.cc
View File

@@ -28,7 +28,7 @@
#include "talk/examples/call/presencepushtask.h"
#include "talk/examples/call/muc.h"
#include "talk/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/base/stringencode.h"

6
talk/examples/call/presencepushtask.h
View File

@@ -31,9 +31,9 @@
#include <vector>
#include "talk/examples/call/callclient.h"
#include "talk/xmpp/presencestatus.h"
#include "talk/xmpp/xmppengine.h"
#include "talk/xmpp/xmpptask.h"
#include "webrtc/libjingle/xmpp/presencestatus.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "webrtc/base/sigslot.h"
namespace buzz {