webrtc/api/mediastream.cc - Issue 1610243002: Move talk/app/webrtc to webrtc/api

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: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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/api/mediastream.h ('k') | webrtc/api/mediastream_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * libjingle	2 * libjingle

3 * Copyright 2011 Google Inc.	3 * Copyright 2011 Google Inc.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions are met:	6 * modification, are permitted provided that the following conditions are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright notice,	8 * 1. Redistributions of source code must retain the above copyright notice,

9 * this list of conditions and the following disclaimer.	9 * this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright notice,	10 * 2. Redistributions in binary form must reproduce the above copyright notice,

11 * this list of conditions and the following disclaimer in the documentation	11 * this list of conditions and the following disclaimer in the documentation

12 * and/or other materials provided with the distribution.	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	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.	14 * derived from this software without specific prior written permission.

15 *	15 *

16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED	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	17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO	18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,	19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,	20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;	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,	22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR	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	24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

26 */	26 */

27	27

28 #include "talk/app/webrtc/mediastream.h"	28 #include "webrtc/api/mediastream.h"

29 #include "webrtc/base/logging.h"	29 #include "webrtc/base/logging.h"

30	30

31 namespace webrtc {	31 namespace webrtc {

32	32

33 template <class V>	33 template <class V>

34 static typename V::iterator FindTrack(V* vector,	34 static typename V::iterator FindTrack(V* vector,

35 const std::string& track_id) {	35 const std::string& track_id) {

36 typename V::iterator it = vector->begin();	36 typename V::iterator it = vector->begin();

37 for (; it != vector->end(); ++it) {	37 for (; it != vector->end(); ++it) {

38 if ((*it)->id() == track_id) {	38 if ((*it)->id() == track_id) {

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 return false;	103 return false;

104 typename TrackVector::iterator it = FindTrack(tracks, track->id());	104 typename TrackVector::iterator it = FindTrack(tracks, track->id());

105 if (it == tracks->end())	105 if (it == tracks->end())

106 return false;	106 return false;

107 tracks->erase(it);	107 tracks->erase(it);

108 FireOnChanged();	108 FireOnChanged();

109 return true;	109 return true;

110 }	110 }

111	111

112 } // namespace webrtc	112 } // namespace webrtc

OLD	NEW