(Auto)update libjingle 72097588-> 72159069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/examples/call/callclient.cc b/talk/examples/call/callclient.cc
index c691db3..7d1cd80 100644
--- a/talk/examples/call/callclient.cc
+++ b/talk/examples/call/callclient.cc
@@ -29,14 +29,14 @@
#include <string>
-#include "talk/base/helpers.h"
-#include "talk/base/logging.h"
-#include "talk/base/network.h"
-#include "talk/base/socketaddress.h"
-#include "talk/base/stringencode.h"
-#include "talk/base/stringutils.h"
-#include "talk/base/thread.h"
-#include "talk/base/windowpickerfactory.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/network.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/windowpickerfactory.h"
#include "talk/examples/call/console.h"
#include "talk/examples/call/friendinvitesendtask.h"
#include "talk/examples/call/muc.h"
@@ -94,7 +94,7 @@
int GetInt(const std::vector<std::string>& words, size_t index, int def) {
int val;
- if (words.size() > index && talk_base::FromString(words[index], &val)) {
+ if (words.size() > index && rtc::FromString(words[index], &val)) {
return val;
} else {
return def;
@@ -251,7 +251,7 @@
console_->PrintLine("Can't screencast twice. Unscreencast first.");
} else {
std::string streamid = "screencast";
- screencast_ssrc_ = talk_base::CreateRandomId();
+ screencast_ssrc_ = rtc::CreateRandomId();
int fps = GetInt(words, 1, 5); // Default to 5 fps.
cricket::ScreencastId screencastid;
@@ -478,7 +478,7 @@
}
void CallClient::InitMedia() {
- worker_thread_ = new talk_base::Thread();
+ worker_thread_ = new rtc::Thread();
// The worker thread must be started here since initialization of
// the ChannelManager will generate messages that need to be
// dispatched by it.
@@ -486,15 +486,15 @@
// TODO: It looks like we are leaking many objects. E.g.
// |network_manager_| is never deleted.
- network_manager_ = new talk_base::BasicNetworkManager();
+ network_manager_ = new rtc::BasicNetworkManager();
// TODO: Decide if the relay address should be specified here.
- talk_base::SocketAddress stun_addr("stun.l.google.com", 19302);
+ rtc::SocketAddress stun_addr("stun.l.google.com", 19302);
cricket::ServerAddresses stun_servers;
stun_servers.insert(stun_addr);
port_allocator_ = new cricket::BasicPortAllocator(
- network_manager_, stun_servers, talk_base::SocketAddress(),
- talk_base::SocketAddress(), talk_base::SocketAddress());
+ network_manager_, stun_servers, rtc::SocketAddress(),
+ rtc::SocketAddress(), rtc::SocketAddress());
if (portallocator_flags_ != 0) {
port_allocator_->set_flags(portallocator_flags_);
@@ -685,7 +685,7 @@
void CallClient::StartXmppPing() {
buzz::PingTask* ping = new buzz::PingTask(
- xmpp_client_, talk_base::Thread::Current(),
+ xmpp_client_, rtc::Thread::Current(),
kPingPeriodMillis, kPingTimeoutMillis);
ping->SignalTimeout.connect(this, &CallClient::OnPingTimeout);
ping->Start();
@@ -741,7 +741,7 @@
void CallClient::SendChat(const std::string& to, const std::string msg) {
buzz::XmlElement* stanza = new buzz::XmlElement(buzz::QN_MESSAGE);
stanza->AddAttr(buzz::QN_TO, to);
- stanza->AddAttr(buzz::QN_ID, talk_base::CreateRandomString(16));
+ stanza->AddAttr(buzz::QN_ID, rtc::CreateRandomString(16));
stanza->AddAttr(buzz::QN_TYPE, "chat");
buzz::XmlElement* body = new buzz::XmlElement(buzz::QN_BODY);
body->SetBodyText(msg);
@@ -781,7 +781,7 @@
cricket::SendDataParams params;
params.ssrc = stream.first_ssrc();
- talk_base::Buffer payload(text.data(), text.length());
+ rtc::Buffer payload(text.data(), text.length());
cricket::SendDataResult result;
bool sent = call_->SendData(session, params, payload, &result);
if (!sent) {
@@ -856,7 +856,7 @@
void CallClient::OnDataReceived(cricket::Call*,
const cricket::ReceiveDataParams& params,
- const talk_base::Buffer& payload) {
+ const rtc::Buffer& payload) {
// TODO(mylesj): Support receiving data on sessions other than the first.
cricket::Session* session = GetFirstSession();
if (!session)
@@ -1106,7 +1106,7 @@
}
void CallClient::Quit() {
- talk_base::Thread::Current()->Quit();
+ rtc::Thread::Current()->Quit();
}
void CallClient::SetNick(const std::string& muc_nick) {
@@ -1564,7 +1564,7 @@
}
}
- talk_base::sprintfn(guid_room,
+ rtc::sprintfn(guid_room,
ARRAY_SIZE(guid_room),
"private-chat-%s@%s",
guid,
@@ -1574,19 +1574,19 @@
bool CallClient::SelectFirstDesktopScreencastId(
cricket::ScreencastId* screencastid) {
- if (!talk_base::WindowPickerFactory::IsSupported()) {
+ if (!rtc::WindowPickerFactory::IsSupported()) {
LOG(LS_WARNING) << "Window picker not suported on this OS.";
return false;
}
- talk_base::WindowPicker* picker =
- talk_base::WindowPickerFactory::CreateWindowPicker();
+ rtc::WindowPicker* picker =
+ rtc::WindowPickerFactory::CreateWindowPicker();
if (!picker) {
LOG(LS_WARNING) << "Could not create a window picker.";
return false;
}
- talk_base::DesktopDescriptionList desktops;
+ rtc::DesktopDescriptionList desktops;
if (!picker->GetDesktopList(&desktops) || desktops.empty()) {
LOG(LS_WARNING) << "Could not get a list of desktops.";
return false;