Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(735)

Unified Diff: Source/modules/webaudio/ChannelMergerNode.cpp

Issue 1214463003: Split "Online" and "Offline" AudioContext processing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Bring to ToT Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/webaudio/ChannelMergerNode.h ('k') | Source/modules/webaudio/ChannelSplitterNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webaudio/ChannelMergerNode.cpp
diff --git a/Source/modules/webaudio/ChannelMergerNode.cpp b/Source/modules/webaudio/ChannelMergerNode.cpp
index f4415fd4fab47a45efd8fb3f161914f39bfcde02..dbb9783f15d39b3384c5f92dbd1c99f5be5345f0 100644
--- a/Source/modules/webaudio/ChannelMergerNode.cpp
+++ b/Source/modules/webaudio/ChannelMergerNode.cpp
@@ -34,7 +34,7 @@
#include "bindings/core/v8/ExceptionState.h"
#include "core/dom/ExceptionCode.h"
#include "core/dom/ExecutionContext.h"
-#include "modules/webaudio/AudioContext.h"
+#include "modules/webaudio/AbstractAudioContext.h"
#include "modules/webaudio/AudioNodeInput.h"
#include "modules/webaudio/AudioNodeOutput.h"
@@ -97,7 +97,7 @@ void ChannelMergerHandler::process(size_t framesToProcess)
void ChannelMergerHandler::setChannelCount(unsigned long channelCount, ExceptionState& exceptionState)
{
ASSERT(isMainThread());
- AudioContext::AutoLocker locker(context());
+ AbstractAudioContext::AutoLocker locker(context());
// channelCount must be 1.
if (channelCount != 1) {
@@ -110,7 +110,7 @@ void ChannelMergerHandler::setChannelCount(unsigned long channelCount, Exception
void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionState& exceptionState)
{
ASSERT(isMainThread());
- AudioContext::AutoLocker locker(context());
+ AbstractAudioContext::AutoLocker locker(context());
// channcelCountMode must be 'explicit'.
if (mode != "explicit") {
@@ -122,15 +122,15 @@ void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionStat
// ----------------------------------------------------------------
-ChannelMergerNode::ChannelMergerNode(AudioContext& context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode::ChannelMergerNode(AbstractAudioContext& context, float sampleRate, unsigned numberOfInputs)
: AudioNode(context)
{
setHandler(ChannelMergerHandler::create(*this, sampleRate, numberOfInputs));
}
-ChannelMergerNode* ChannelMergerNode::create(AudioContext& context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, float sampleRate, unsigned numberOfInputs)
{
- if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
+ if (!numberOfInputs || numberOfInputs > AbstractAudioContext::maxNumberOfChannels())
return nullptr;
return new ChannelMergerNode(context, sampleRate, numberOfInputs);
}
« no previous file with comments | « Source/modules/webaudio/ChannelMergerNode.h ('k') | Source/modules/webaudio/ChannelSplitterNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698