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

(Auto)update libjingle 72097588-> 72159069

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-07-29 17:36:52 +00:00
parent fc8b0871d9
commit d4e598d57a
509 changed files with 7114 additions and 7239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
talk/examples/peerconnection/client/linux/main.cc
View File

@@ -32,12 +32,12 @@
#include "talk/examples/peerconnection/client/linux/main_wnd.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "talk/base/ssladapter.h"
#include "talk/base/thread.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/base/thread.h"
class CustomSocketServer : public talk_base::PhysicalSocketServer {
class CustomSocketServer : public rtc::PhysicalSocketServer {
public:
CustomSocketServer(talk_base::Thread* thread, GtkMainWnd* wnd)
CustomSocketServer(rtc::Thread* thread, GtkMainWnd* wnd)
: thread_(thread), wnd_(wnd), conductor_(NULL), client_(NULL) {}
virtual ~CustomSocketServer() {}
@@ -58,12 +58,12 @@ class CustomSocketServer : public talk_base::PhysicalSocketServer {
client_ != NULL && !client_->is_connected()) {
thread_->Quit();
}
return talk_base::PhysicalSocketServer::Wait(0/*cms == -1 ? 1 : cms*/,
return rtc::PhysicalSocketServer::Wait(0/*cms == -1 ? 1 : cms*/,
process_io);
}
protected:
talk_base::Thread* thread_;
rtc::Thread* thread_;
GtkMainWnd* wnd_;
Conductor* conductor_;
PeerConnectionClient* client_;
@@ -74,9 +74,9 @@ int main(int argc, char* argv[]) {
g_type_init();
g_thread_init(NULL);
FlagList::SetFlagsFromCommandLine(&argc, argv, true);
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
if (FLAG_help) {
FlagList::Print(NULL, false);
rtc::FlagList::Print(NULL, false);
return 0;
}
@@ -90,16 +90,16 @@ int main(int argc, char* argv[]) {
GtkMainWnd wnd(FLAG_server, FLAG_port, FLAG_autoconnect, FLAG_autocall);
wnd.Create();
talk_base::AutoThread auto_thread;
talk_base::Thread* thread = talk_base::Thread::Current();
rtc::AutoThread auto_thread;
rtc::Thread* thread = rtc::Thread::Current();
CustomSocketServer socket_server(thread, &wnd);
thread->set_socketserver(&socket_server);
talk_base::InitializeSSL();
rtc::InitializeSSL();
// Must be constructed after we set the socketserver.
PeerConnectionClient client;
talk_base::scoped_refptr<Conductor> conductor(
new talk_base::RefCountedObject<Conductor>(&client, &wnd));
rtc::scoped_refptr<Conductor> conductor(
new rtc::RefCountedObject<Conductor>(&client, &wnd));
socket_server.set_client(&client);
socket_server.set_conductor(conductor);
@@ -113,7 +113,7 @@ int main(int argc, char* argv[]) {
//while (gtk_events_pending()) {
// gtk_main_iteration();
//}
talk_base::CleanupSSL();
rtc::CleanupSSL();
return 0;
}