| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. |
| 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 if (!m_audioTracks.size() && !m_videoTracks.size()) | 232 if (!m_audioTracks.size() && !m_videoTracks.size()) |
| 233 m_descriptor->setEnded(); | 233 m_descriptor->setEnded(); |
| 234 | 234 |
| 235 MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_descriptor.get(),
track->component()); | 235 MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_descriptor.get(),
track->component()); |
| 236 } | 236 } |
| 237 | 237 |
| 238 MediaStreamTrack* MediaStream::getTrackById(String id) | 238 MediaStreamTrack* MediaStream::getTrackById(String id) |
| 239 { | 239 { |
| 240 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter !=
m_audioTracks.end(); ++iter) { | 240 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter !=
m_audioTracks.end(); ++iter) { |
| 241 if ((*iter)->id() == id) | 241 if ((*iter)->id() == id) |
| 242 return (*iter).get(); | 242 return iter->get(); |
| 243 } | 243 } |
| 244 | 244 |
| 245 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter !=
m_videoTracks.end(); ++iter) { | 245 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter !=
m_videoTracks.end(); ++iter) { |
| 246 if ((*iter)->id() == id) | 246 if ((*iter)->id() == id) |
| 247 return (*iter).get(); | 247 return iter->get(); |
| 248 } | 248 } |
| 249 | 249 |
| 250 return 0; | 250 return 0; |
| 251 } | 251 } |
| 252 | 252 |
| 253 PassRefPtr<MediaStream> MediaStream::clone(ExecutionContext* context) | 253 PassRefPtr<MediaStream> MediaStream::clone(ExecutionContext* context) |
| 254 { | 254 { |
| 255 MediaStreamTrackVector tracks; | 255 MediaStreamTrackVector tracks; |
| 256 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter !=
m_audioTracks.end(); ++iter) | 256 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter !=
m_audioTracks.end(); ++iter) |
| 257 tracks.append((*iter)->clone(context)); | 257 tracks.append((*iter)->clone(context)); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 | 387 |
| 388 events.clear(); | 388 events.clear(); |
| 389 } | 389 } |
| 390 | 390 |
| 391 URLRegistry& MediaStream::registry() const | 391 URLRegistry& MediaStream::registry() const |
| 392 { | 392 { |
| 393 return MediaStreamRegistry::registry(); | 393 return MediaStreamRegistry::registry(); |
| 394 } | 394 } |
| 395 | 395 |
| 396 } // namespace WebCore | 396 } // namespace WebCore |
| OLD | NEW |