| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #if ENABLE(MEDIA_STREAM) | 33 #if ENABLE(MEDIA_STREAM) |
| 34 | 34 |
| 35 #include <public/WebMediaStreamSource.h> | 35 #include <public/WebMediaStreamSource.h> |
| 36 | 36 |
| 37 #include "MediaStreamSource.h" | |
| 38 #include "core/platform/audio/AudioBus.h" | 37 #include "core/platform/audio/AudioBus.h" |
| 38 #include "core/platform/mediastream/MediaStreamSource.h" |
| 39 #include <public/WebAudioDestinationConsumer.h> | 39 #include <public/WebAudioDestinationConsumer.h> |
| 40 #include <public/WebString.h> | 40 #include <public/WebString.h> |
| 41 #include <wtf/MainThread.h> | 41 #include <wtf/MainThread.h> |
| 42 #include <wtf/PassOwnPtr.h> | 42 #include <wtf/PassOwnPtr.h> |
| 43 #include <wtf/Vector.h> | 43 #include <wtf/Vector.h> |
| 44 | 44 |
| 45 using namespace WebCore; | 45 using namespace WebCore; |
| 46 | 46 |
| 47 namespace WebKit { | 47 namespace WebKit { |
| 48 | 48 |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 return true; | 218 return true; |
| 219 } | 219 } |
| 220 } | 220 } |
| 221 return false; | 221 return false; |
| 222 } | 222 } |
| 223 | 223 |
| 224 } // namespace WebKit | 224 } // namespace WebKit |
| 225 | 225 |
| 226 #endif // ENABLE(MEDIA_STREAM) | 226 #endif // ENABLE(MEDIA_STREAM) |
| 227 | 227 |
| OLD | NEW |