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

Side by Side Diff: webrtc/api/mediastream.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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 2011 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2011 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/app/webrtc/mediastream.h" 11 #include "webrtc/api/mediastream.h"
29 #include "webrtc/base/logging.h" 12 #include "webrtc/base/logging.h"
30 13
31 namespace webrtc { 14 namespace webrtc {
32 15
33 template <class V> 16 template <class V>
34 static typename V::iterator FindTrack(V* vector, 17 static typename V::iterator FindTrack(V* vector,
35 const std::string& track_id) { 18 const std::string& track_id) {
36 typename V::iterator it = vector->begin(); 19 typename V::iterator it = vector->begin();
37 for (; it != vector->end(); ++it) { 20 for (; it != vector->end(); ++it) {
38 if ((*it)->id() == track_id) { 21 if ((*it)->id() == track_id) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return false; 86 return false;
104 typename TrackVector::iterator it = FindTrack(tracks, track->id()); 87 typename TrackVector::iterator it = FindTrack(tracks, track->id());
105 if (it == tracks->end()) 88 if (it == tracks->end())
106 return false; 89 return false;
107 tracks->erase(it); 90 tracks->erase(it);
108 FireOnChanged(); 91 FireOnChanged();
109 return true; 92 return true;
110 } 93 }
111 94
112 } // namespace webrtc 95 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698