Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Unified Diff: talk/examples/peerconnection/client/linux/main.cc

Issue 1235563006: Move talk/examples/* to webrtc/examples. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 201508051337 Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/examples/peerconnection/client/linux/main.cc
diff --git a/talk/examples/peerconnection/client/linux/main.cc b/talk/examples/peerconnection/client/linux/main.cc
deleted file mode 100644
index 3b39fccb92e4258bc8f9d2d5c04bdf7daebaa446..0000000000000000000000000000000000000000
--- a/talk/examples/peerconnection/client/linux/main.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * libjingle
- * Copyright 2012 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <gtk/gtk.h>
-
-#include "talk/examples/peerconnection/client/conductor.h"
-#include "talk/examples/peerconnection/client/flagdefs.h"
-#include "talk/examples/peerconnection/client/linux/main_wnd.h"
-#include "talk/examples/peerconnection/client/peer_connection_client.h"
-
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-
-class CustomSocketServer : public rtc::PhysicalSocketServer {
- public:
- CustomSocketServer(rtc::Thread* thread, GtkMainWnd* wnd)
- : thread_(thread), wnd_(wnd), conductor_(NULL), client_(NULL) {}
- virtual ~CustomSocketServer() {}
-
- void set_client(PeerConnectionClient* client) { client_ = client; }
- void set_conductor(Conductor* conductor) { conductor_ = conductor; }
-
- // Override so that we can also pump the GTK message loop.
- virtual bool Wait(int cms, bool process_io) {
- // Pump GTK events.
- // TODO: We really should move either the socket server or UI to a
- // different thread. Alternatively we could look at merging the two loops
- // by implementing a dispatcher for the socket server and/or use
- // g_main_context_set_poll_func.
- while (gtk_events_pending())
- gtk_main_iteration();
-
- if (!wnd_->IsWindow() && !conductor_->connection_active() &&
- client_ != NULL && !client_->is_connected()) {
- thread_->Quit();
- }
- return rtc::PhysicalSocketServer::Wait(0/*cms == -1 ? 1 : cms*/,
- process_io);
- }
-
- protected:
- rtc::Thread* thread_;
- GtkMainWnd* wnd_;
- Conductor* conductor_;
- PeerConnectionClient* client_;
-};
-
-int main(int argc, char* argv[]) {
- gtk_init(&argc, &argv);
- g_type_init();
- // g_thread_init API is deprecated since glib 2.31.0, see release note:
- // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
-#if !GLIB_CHECK_VERSION(2, 31, 0)
- g_thread_init(NULL);
-#endif
-
- rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
- if (FLAG_help) {
- rtc::FlagList::Print(NULL, false);
- return 0;
- }
-
- // Abort if the user specifies a port that is outside the allowed
- // range [1, 65535].
- if ((FLAG_port < 1) || (FLAG_port > 65535)) {
- printf("Error: %i is not a valid port.\n", FLAG_port);
- return -1;
- }
-
- GtkMainWnd wnd(FLAG_server, FLAG_port, FLAG_autoconnect, FLAG_autocall);
- wnd.Create();
-
- rtc::AutoThread auto_thread;
- rtc::Thread* thread = rtc::Thread::Current();
- CustomSocketServer socket_server(thread, &wnd);
- thread->set_socketserver(&socket_server);
-
- rtc::InitializeSSL();
- // Must be constructed after we set the socketserver.
- PeerConnectionClient client;
- rtc::scoped_refptr<Conductor> conductor(
- new rtc::RefCountedObject<Conductor>(&client, &wnd));
- socket_server.set_client(&client);
- socket_server.set_conductor(conductor);
-
- thread->Run();
-
- // gtk_main();
- wnd.Destroy();
-
- thread->set_socketserver(NULL);
- // TODO: Run the Gtk main loop to tear down the connection.
- //while (gtk_events_pending()) {
- // gtk_main_iteration();
- //}
- rtc::CleanupSSL();
- return 0;
-}
« no previous file with comments | « talk/examples/peerconnection/client/flagdefs.h ('k') | talk/examples/peerconnection/client/linux/main_wnd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698