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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.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 unified diff | Download patch
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 #include "talk/examples/peerconnection/client/conductor.h" 11 #include "webrtc/examples/peerconnection/client/conductor.h"
29 12
30 #include <utility> 13 #include <utility>
31 #include <vector> 14 #include <vector>
32 15
33 #include "talk/app/webrtc/videosourceinterface.h" 16 #include "talk/app/webrtc/videosourceinterface.h"
34 #include "talk/examples/peerconnection/client/defaults.h" 17 #include "webrtc/examples/peerconnection/client/defaults.h"
35 #include "talk/media/devices/devicemanager.h" 18 #include "talk/media/devices/devicemanager.h"
36 #include "talk/app/webrtc/test/fakeconstraints.h" 19 #include "talk/app/webrtc/test/fakeconstraints.h"
37 #include "webrtc/base/common.h" 20 #include "webrtc/base/common.h"
38 #include "webrtc/base/json.h" 21 #include "webrtc/base/json.h"
39 #include "webrtc/base/logging.h" 22 #include "webrtc/base/logging.h"
40 23
41 // Names used for a IceCandidate JSON object. 24 // Names used for a IceCandidate JSON object.
42 const char kCandidateSdpMidName[] = "sdpMid"; 25 const char kCandidateSdpMidName[] = "sdpMid";
43 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex"; 26 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex";
44 const char kCandidateSdpName[] = "candidate"; 27 const char kCandidateSdpName[] = "candidate";
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 } 537 }
555 538
556 void Conductor::OnFailure(const std::string& error) { 539 void Conductor::OnFailure(const std::string& error) {
557 LOG(LERROR) << error; 540 LOG(LERROR) << error;
558 } 541 }
559 542
560 void Conductor::SendMessage(const std::string& json_object) { 543 void Conductor::SendMessage(const std::string& json_object) {
561 std::string* msg = new std::string(json_object); 544 std::string* msg = new std::string(json_object);
562 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); 545 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg);
563 } 546 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/conductor.h ('k') | webrtc/examples/peerconnection/client/defaults.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698