| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track) | 127 void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track) |
| 128 { | 128 { |
| 129 if (m_private) | 129 if (m_private) |
| 130 m_private->didCreateMediaStreamTrack(track); | 130 m_private->didCreateMediaStreamTrack(track); |
| 131 } | 131 } |
| 132 | 132 |
| 133 PassOwnPtr<AudioSourceProvider> MediaStreamCenter::createWebAudioSourceFromMedia
StreamTrack(MediaStreamComponent* track) | 133 PassOwnPtr<AudioSourceProvider> MediaStreamCenter::createWebAudioSourceFromMedia
StreamTrack(MediaStreamComponent* track) |
| 134 { | 134 { |
| 135 ASSERT_UNUSED(track, track); | 135 ASSERT_UNUSED(track, track); |
| 136 #if ENABLE(WEB_AUDIO) | |
| 137 if (m_private) | 136 if (m_private) |
| 138 return MediaStreamWebAudioSource::create(adoptPtr(m_private->createWebAu
dioSourceFromMediaStreamTrack(track))); | 137 return MediaStreamWebAudioSource::create(adoptPtr(m_private->createWebAu
dioSourceFromMediaStreamTrack(track))); |
| 139 #endif | |
| 140 | 138 |
| 141 return nullptr; | 139 return nullptr; |
| 142 } | 140 } |
| 143 | 141 |
| 144 void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStr
eam) | 142 void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStr
eam) |
| 145 { | 143 { |
| 146 MediaStreamDescriptor* stream = webStream; | 144 MediaStreamDescriptor* stream = webStream; |
| 147 MediaStreamDescriptorClient* client = stream->client(); | 145 MediaStreamDescriptorClient* client = stream->client(); |
| 148 if (client) | 146 if (client) |
| 149 client->streamEnded(); | 147 client->streamEnded(); |
| 150 else | 148 else |
| 151 stream->setEnded(); | 149 stream->setEnded(); |
| 152 } | 150 } |
| 153 | 151 |
| 154 } // namespace blink | 152 } // namespace blink |
| OLD | NEW |