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 28 matching lines...) Expand all Loading... |
39 #include "public/platform/Platform.h" | 39 #include "public/platform/Platform.h" |
40 #include "public/platform/WebAudioSourceProvider.h" | 40 #include "public/platform/WebAudioSourceProvider.h" |
41 #include "public/platform/WebMediaStream.h" | 41 #include "public/platform/WebMediaStream.h" |
42 #include "public/platform/WebMediaStreamCenter.h" | 42 #include "public/platform/WebMediaStreamCenter.h" |
43 #include "public/platform/WebMediaStreamTrack.h" | 43 #include "public/platform/WebMediaStreamTrack.h" |
44 #include "public/platform/WebMediaStreamTrackSourcesRequest.h" | 44 #include "public/platform/WebMediaStreamTrackSourcesRequest.h" |
45 #include "wtf/Assertions.h" | 45 #include "wtf/Assertions.h" |
46 #include "wtf/MainThread.h" | 46 #include "wtf/MainThread.h" |
47 #include "wtf/PassOwnPtr.h" | 47 #include "wtf/PassOwnPtr.h" |
48 | 48 |
49 namespace WebCore { | 49 namespace blink { |
50 | 50 |
51 MediaStreamCenter& MediaStreamCenter::instance() | 51 MediaStreamCenter& MediaStreamCenter::instance() |
52 { | 52 { |
53 ASSERT(isMainThread()); | 53 ASSERT(isMainThread()); |
54 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); | 54 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); |
55 return center; | 55 return center; |
56 } | 56 } |
57 | 57 |
58 MediaStreamCenter::MediaStreamCenter() | 58 MediaStreamCenter::MediaStreamCenter() |
59 : m_private(adoptPtr(blink::Platform::current()->createMediaStreamCenter(thi
s))) | 59 : m_private(adoptPtr(blink::Platform::current()->createMediaStreamCenter(thi
s))) |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStr
eam) | 144 void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStr
eam) |
145 { | 145 { |
146 MediaStreamDescriptor* stream = webStream; | 146 MediaStreamDescriptor* stream = webStream; |
147 MediaStreamDescriptorClient* client = stream->client(); | 147 MediaStreamDescriptorClient* client = stream->client(); |
148 if (client) | 148 if (client) |
149 client->streamEnded(); | 149 client->streamEnded(); |
150 else | 150 else |
151 stream->setEnded(); | 151 stream->setEnded(); |
152 } | 152 } |
153 | 153 |
154 } // namespace WebCore | 154 } // namespace blink |
OLD | NEW |