| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
| 3 * Copyright 2012 Google Inc. | |
| 4 * | 3 * |
| 5 * Redistribution and use in source and binary forms, with or without | 4 * Use of this source code is governed by a BSD-style license |
| 6 * modification, are permitted provided that the following conditions are met: | 5 * that can be found in the LICENSE file in the root of the source |
| 7 * | 6 * tree. An additional intellectual property rights grant can be found |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 7 * in the file PATENTS. All contributing project authors may |
| 9 * this list of conditions and the following disclaimer. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | |
| 11 * this list of conditions and the following disclaimer in the documentation | |
| 12 * and/or other materials provided with the distribution. | |
| 13 * 3. The name of the author may not be used to endorse or promote products | |
| 14 * derived from this software without specific prior written permission. | |
| 15 * | |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 26 */ | 9 */ |
| 27 | 10 |
| 28 #include <gtk/gtk.h> | 11 #include <gtk/gtk.h> |
| 29 | 12 |
| 30 #include "talk/examples/peerconnection/client/conductor.h" | 13 #include "webrtc/examples/peerconnection/client/conductor.h" |
| 31 #include "talk/examples/peerconnection/client/flagdefs.h" | 14 #include "webrtc/examples/peerconnection/client/flagdefs.h" |
| 32 #include "talk/examples/peerconnection/client/linux/main_wnd.h" | 15 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h" |
| 33 #include "talk/examples/peerconnection/client/peer_connection_client.h" | 16 #include "webrtc/examples/peerconnection/client/peer_connection_client.h" |
| 34 | 17 |
| 35 #include "webrtc/base/ssladapter.h" | 18 #include "webrtc/base/ssladapter.h" |
| 36 #include "webrtc/base/thread.h" | 19 #include "webrtc/base/thread.h" |
| 37 | 20 |
| 38 class CustomSocketServer : public rtc::PhysicalSocketServer { | 21 class CustomSocketServer : public rtc::PhysicalSocketServer { |
| 39 public: | 22 public: |
| 40 CustomSocketServer(rtc::Thread* thread, GtkMainWnd* wnd) | 23 CustomSocketServer(rtc::Thread* thread, GtkMainWnd* wnd) |
| 41 : thread_(thread), wnd_(wnd), conductor_(NULL), client_(NULL) {} | 24 : thread_(thread), wnd_(wnd), conductor_(NULL), client_(NULL) {} |
| 42 virtual ~CustomSocketServer() {} | 25 virtual ~CustomSocketServer() {} |
| 43 | 26 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 wnd.Destroy(); | 96 wnd.Destroy(); |
| 114 | 97 |
| 115 thread->set_socketserver(NULL); | 98 thread->set_socketserver(NULL); |
| 116 // TODO: Run the Gtk main loop to tear down the connection. | 99 // TODO: Run the Gtk main loop to tear down the connection. |
| 117 //while (gtk_events_pending()) { | 100 //while (gtk_events_pending()) { |
| 118 // gtk_main_iteration(); | 101 // gtk_main_iteration(); |
| 119 //} | 102 //} |
| 120 rtc::CleanupSSL(); | 103 rtc::CleanupSSL(); |
| 121 return 0; | 104 return 0; |
| 122 } | 105 } |
| OLD | NEW |