summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp')
-rw-r--r--chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp b/chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
index 34d883a0d42..0e26912194d 100644
--- a/chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/chromium/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -28,18 +28,18 @@
#include "modules/webaudio/MediaStreamAudioDestinationNode.h"
-#include "core/platform/mediastream/MediaStreamCenter.h"
-#include "core/platform/mediastream/RTCPeerConnectionHandler.h"
#include "modules/webaudio/AudioContext.h"
#include "modules/webaudio/AudioNodeInput.h"
#include "platform/UUID.h"
+#include "platform/mediastream/MediaStreamCenter.h"
+#include "public/platform/WebRTCPeerConnectionHandler.h"
#include "wtf/Locker.h"
namespace WebCore {
-PassRefPtr<MediaStreamAudioDestinationNode> MediaStreamAudioDestinationNode::create(AudioContext* context, size_t numberOfChannels)
+PassRefPtrWillBeRawPtr<MediaStreamAudioDestinationNode> MediaStreamAudioDestinationNode::create(AudioContext* context, size_t numberOfChannels)
{
- return adoptRef(new MediaStreamAudioDestinationNode(context, numberOfChannels));
+ return adoptRefWillBeNoop(new MediaStreamAudioDestinationNode(context, numberOfChannels));
}
MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* context, size_t numberOfChannels)
@@ -54,18 +54,13 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* c
audioSources.append(m_source);
MediaStreamSourceVector videoSources;
m_stream = MediaStream::create(context->executionContext(), MediaStreamDescriptor::create(audioSources, videoSources));
- MediaStreamCenter::instance().didCreateMediaStream(m_stream->descriptor());
+ MediaStreamCenter::instance().didCreateMediaStreamAndTracks(m_stream->descriptor());
m_source->setAudioFormat(numberOfChannels, context->sampleRate());
initialize();
}
-MediaStreamSource* MediaStreamAudioDestinationNode::mediaStreamSource()
-{
- return m_source.get();
-}
-
MediaStreamAudioDestinationNode::~MediaStreamAudioDestinationNode()
{
uninitialize();
@@ -77,10 +72,6 @@ void MediaStreamAudioDestinationNode::process(size_t numberOfFrames)
m_source->consumeAudio(m_mixBus.get(), numberOfFrames);
}
-void MediaStreamAudioDestinationNode::reset()
-{
-}
-
} // namespace WebCore
#endif // ENABLE(WEB_AUDIO)