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