| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "platform/mediastream/MediaStreamCenter.h" | 32 #include "platform/mediastream/MediaStreamCenter.h" |
| 33 | 33 |
| 34 #include <memory> |
| 34 #include "platform/mediastream/MediaStreamDescriptor.h" | 35 #include "platform/mediastream/MediaStreamDescriptor.h" |
| 35 #include "platform/mediastream/MediaStreamWebAudioSource.h" | 36 #include "platform/mediastream/MediaStreamWebAudioSource.h" |
| 36 #include "public/platform/Platform.h" | 37 #include "public/platform/Platform.h" |
| 37 #include "public/platform/WebAudioSourceProvider.h" | 38 #include "public/platform/WebAudioSourceProvider.h" |
| 38 #include "public/platform/WebMediaStream.h" | 39 #include "public/platform/WebMediaStream.h" |
| 39 #include "public/platform/WebMediaStreamCenter.h" | 40 #include "public/platform/WebMediaStreamCenter.h" |
| 40 #include "public/platform/WebMediaStreamTrack.h" | 41 #include "public/platform/WebMediaStreamTrack.h" |
| 41 #include "wtf/Assertions.h" | 42 #include "wtf/Assertions.h" |
| 42 #include "wtf/PtrUtil.h" | 43 #include "wtf/PtrUtil.h" |
| 43 #include <memory> | |
| 44 | 44 |
| 45 namespace blink { | 45 namespace blink { |
| 46 | 46 |
| 47 MediaStreamCenter& MediaStreamCenter::instance() { | 47 MediaStreamCenter& MediaStreamCenter::instance() { |
| 48 ASSERT(isMainThread()); | 48 ASSERT(isMainThread()); |
| 49 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); | 49 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); |
| 50 return center; | 50 return center; |
| 51 } | 51 } |
| 52 | 52 |
| 53 MediaStreamCenter::MediaStreamCenter() | 53 MediaStreamCenter::MediaStreamCenter() |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 } | 134 } |
| 135 | 135 |
| 136 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) { | 136 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) { |
| 137 MediaStreamDescriptor* stream = webStream; | 137 MediaStreamDescriptor* stream = webStream; |
| 138 MediaStreamDescriptorClient* client = stream->client(); | 138 MediaStreamDescriptorClient* client = stream->client(); |
| 139 if (client) | 139 if (client) |
| 140 client->streamEnded(); | 140 client->streamEnded(); |
| 141 } | 141 } |
| 142 | 142 |
| 143 } // namespace blink | 143 } // namespace blink |
| OLD | NEW |