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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

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 unified diff | Download patch
« no previous file with comments | « webrtc/examples/objc/README ('k') | webrtc/examples/peerconnection/client/conductor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 11 #ifndef TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
29 #define TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 12 #define TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
30 #pragma once 13 #pragma once
31 14
32 #include <deque> 15 #include <deque>
33 #include <map> 16 #include <map>
34 #include <set> 17 #include <set>
35 #include <string> 18 #include <string>
36 19
37 #include "talk/app/webrtc/mediastreaminterface.h" 20 #include "talk/app/webrtc/mediastreaminterface.h"
38 #include "talk/app/webrtc/peerconnectioninterface.h" 21 #include "talk/app/webrtc/peerconnectioninterface.h"
39 #include "talk/examples/peerconnection/client/main_wnd.h" 22 #include "webrtc/examples/peerconnection/client/main_wnd.h"
40 #include "talk/examples/peerconnection/client/peer_connection_client.h" 23 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
41 #include "webrtc/base/scoped_ptr.h" 24 #include "webrtc/base/scoped_ptr.h"
42 25
43 namespace webrtc { 26 namespace webrtc {
44 class VideoCaptureModule; 27 class VideoCaptureModule;
45 } // namespace webrtc 28 } // namespace webrtc
46 29
47 namespace cricket { 30 namespace cricket {
48 class VideoRenderer; 31 class VideoRenderer;
49 } // namespace cricket 32 } // namespace cricket
50 33
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 peer_connection_factory_; 120 peer_connection_factory_;
138 PeerConnectionClient* client_; 121 PeerConnectionClient* client_;
139 MainWindow* main_wnd_; 122 MainWindow* main_wnd_;
140 std::deque<std::string*> pending_messages_; 123 std::deque<std::string*> pending_messages_;
141 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 124 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
142 active_streams_; 125 active_streams_;
143 std::string server_; 126 std::string server_;
144 }; 127 };
145 128
146 #endif // TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 129 #endif // TALK_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW
« no previous file with comments | « webrtc/examples/objc/README ('k') | webrtc/examples/peerconnection/client/conductor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698