Diff
Modified: trunk/LayoutTests/ChangeLog (96524 => 96525)
--- trunk/LayoutTests/ChangeLog 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/LayoutTests/ChangeLog 2011-10-03 19:13:22 UTC (rev 96525)
@@ -1,3 +1,13 @@
+2011-10-03 Chris Rogers <[email protected]>
+
+ BiquadFilterNode .type attribute is not handled correctly
+ https://bugs.webkit.org/show_bug.cgi?id=69182
+
+ Reviewed by Kenneth Russell.
+
+ * webaudio/biquadfilternode-basic-expected.txt: Added.
+ * webaudio/biquadfilternode-basic.html: Added.
+
2011-10-03 Chris Fleizach <[email protected]>
AX: support role mapping for HTML5 section elements
Added: trunk/LayoutTests/webaudio/biquadfilternode-basic-expected.txt (0 => 96525)
--- trunk/LayoutTests/webaudio/biquadfilternode-basic-expected.txt (rev 0)
+++ trunk/LayoutTests/webaudio/biquadfilternode-basic-expected.txt 2011-10-03 19:13:22 UTC (rev 96525)
@@ -0,0 +1,18 @@
+Basic tests for BiquadFilterNode.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS Biquad filter defaults to low-pass filter.
+PASS Biquad filter type 0 is settable.
+PASS Biquad filter type 1 is settable.
+PASS Biquad filter type 2 is settable.
+PASS Biquad filter type 3 is settable.
+PASS Biquad filter type 4 is settable.
+PASS Biquad filter type 5 is settable.
+PASS Biquad filter type 6 is settable.
+PASS Biquad filter type 7 is settable.
+PASS Illegal filter type correctly throws exception.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/webaudio/biquadfilternode-basic.html (0 => 96525)
--- trunk/LayoutTests/webaudio/biquadfilternode-basic.html (rev 0)
+++ trunk/LayoutTests/webaudio/biquadfilternode-basic.html 2011-10-03 19:13:22 UTC (rev 96525)
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<link rel="stylesheet" href=""
+<script src=""
+</head>
+
+<body>
+<div id="description"></div>
+<div id="console"></div>
+
+<script>
+description("Basic tests for BiquadFilterNode.");
+
+var context = 0;
+
+function runTest() {
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ window.jsTestIsAsync = true;
+
+ context = new webkitAudioContext();
+ var filter = context.createBiquadFilter();
+
+ // FIXME: we need to expose the actual filter type constants in the IDL
+
+ // Check the filter type.
+ if (filter.type == 0)
+ testPassed("Biquad filter defaults to low-pass filter.");
+ else
+ testFailed("Biquad filter should default to low-pass filter.");
+
+ // Check that all legal filter types can be set.
+ // FIXME: use last defined filter constant (ALLPASS) instead of hard-coded 7 once it's defined in the IDL.
+ for (var i = 0; i <= 7; ++i) {
+ try {
+ filter.type = i;
+
+ if (filter.type == i) {
+ var message = "Biquad filter type " + i + " is settable.";
+ testPassed(message);
+ } else {
+ var message = "Biquad filter type " + i + " was not correctly set.";
+ testFailed(message);
+ }
+ } catch(e) {
+ var message = "Biquad filter type " + i + " should not throw exception.";
+ testFailed(message);
+ }
+ }
+
+ // Check that illegal filter type throws.
+ try {
+ filter.type = 8;
+ testFailed("Illegal filter type should throw exception.");
+ } catch(e) {
+ testPassed("Illegal filter type correctly throws exception.");
+ }
+
+ finishJSTest();
+}
+
+runTest();
+successfullyParsed = true;
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (96524 => 96525)
--- trunk/Source/WebCore/ChangeLog 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/ChangeLog 2011-10-03 19:13:22 UTC (rev 96525)
@@ -1,3 +1,61 @@
+2011-10-03 Chris Rogers <[email protected]>
+
+ BiquadFilterNode .type attribute is not handled correctly
+ https://bugs.webkit.org/show_bug.cgi?id=69182
+
+ Reviewed by Kenneth Russell.
+
+ Test: webaudio/biquadfilternode-basic.html
+
+ * platform/audio/AudioDSPKernelProcessor.cpp:
+ (WebCore::AudioDSPKernelProcessor::initialize):
+ * webaudio/AudioBufferSourceNode.cpp:
+ (WebCore::AudioBufferSourceNode::AudioBufferSourceNode):
+ * webaudio/AudioChannelMerger.cpp:
+ (WebCore::AudioChannelMerger::AudioChannelMerger):
+ * webaudio/AudioChannelSplitter.cpp:
+ (WebCore::AudioChannelSplitter::AudioChannelSplitter):
+ * webaudio/AudioDestinationNode.cpp:
+ (WebCore::AudioDestinationNode::AudioDestinationNode):
+ * webaudio/AudioGainNode.cpp:
+ (WebCore::AudioGainNode::AudioGainNode):
+ * webaudio/AudioNode.cpp:
+ (WebCore::AudioNode::AudioNode):
+ (WebCore::AudioNode::~AudioNode):
+ (WebCore::AudioNode::setNodeType):
+ (WebCore::AudioNode::ref):
+ (WebCore::AudioNode::finishDeref):
+ * webaudio/AudioNode.h:
+ (WebCore::AudioNode::nodeType):
+ * webaudio/AudioPannerNode.cpp:
+ (WebCore::AudioPannerNode::AudioPannerNode):
+ (WebCore::AudioPannerNode::notifyAudioSourcesConnectedToNode):
+ * webaudio/BiquadFilterNode.cpp:
+ (WebCore::BiquadFilterNode::BiquadFilterNode):
+ (WebCore::BiquadFilterNode::setType):
+ * webaudio/BiquadFilterNode.h:
+ * webaudio/BiquadFilterNode.idl:
+ * webaudio/BiquadProcessor.h:
+ (WebCore::BiquadProcessor::setType):
+ * webaudio/ConvolverNode.cpp:
+ (WebCore::ConvolverNode::ConvolverNode):
+ * webaudio/DelayNode.cpp:
+ (WebCore::DelayNode::DelayNode):
+ * webaudio/DynamicsCompressorNode.cpp:
+ (WebCore::DynamicsCompressorNode::DynamicsCompressorNode):
+ * webaudio/HighPass2FilterNode.cpp:
+ (WebCore::HighPass2FilterNode::HighPass2FilterNode):
+ * webaudio/_javascript_AudioNode.cpp:
+ (WebCore::_javascript_AudioNode::_javascript_AudioNode):
+ * webaudio/LowPass2FilterNode.cpp:
+ (WebCore::LowPass2FilterNode::LowPass2FilterNode):
+ * webaudio/MediaElementAudioSourceNode.cpp:
+ (WebCore::MediaElementAudioSourceNode::MediaElementAudioSourceNode):
+ * webaudio/RealtimeAnalyserNode.cpp:
+ (WebCore::RealtimeAnalyserNode::RealtimeAnalyserNode):
+ * webaudio/WaveShaperNode.cpp:
+ (WebCore::WaveShaperNode::WaveShaperNode):
+
2011-10-03 Chris Fleizach <[email protected]>
AX: support role mapping for HTML5 section elements
Modified: trunk/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp (96524 => 96525)
--- trunk/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/platform/audio/AudioDSPKernelProcessor.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -56,8 +56,9 @@
// Create processing kernels, one per channel.
for (unsigned i = 0; i < numberOfChannels(); ++i)
m_kernels.append(createKernel());
-
+
m_initialized = true;
+ m_hasJustReset = true;
}
void AudioDSPKernelProcessor::uninitialize()
Modified: trunk/Source/WebCore/webaudio/AudioBufferSourceNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioBufferSourceNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioBufferSourceNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -68,7 +68,7 @@
, m_lastGain(1.0)
, m_pannerNode(0)
{
- setType(NodeTypeAudioBufferSource);
+ setNodeType(NodeTypeAudioBufferSource);
m_gain = AudioGain::create("gain", 1.0, 0.0, 1.0);
m_playbackRate = AudioParam::create("playbackRate", 1.0, 0.0, MaxRate);
Modified: trunk/Source/WebCore/webaudio/AudioChannelMerger.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioChannelMerger.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioChannelMerger.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -51,7 +51,7 @@
addOutput(adoptPtr(new AudioNodeOutput(this, 1)));
- setType(NodeTypeChannelMerger);
+ setNodeType(NodeTypeChannelMerger);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/AudioChannelSplitter.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioChannelSplitter.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioChannelSplitter.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -46,7 +46,7 @@
for (unsigned i = 0; i < NumberOfOutputs; ++i)
addOutput(adoptPtr(new AudioNodeOutput(this, 1)));
- setType(NodeTypeChannelSplitter);
+ setNodeType(NodeTypeChannelSplitter);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/AudioDestinationNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioDestinationNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioDestinationNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -42,7 +42,7 @@
{
addInput(adoptPtr(new AudioNodeInput(this)));
- setType(NodeTypeDestination);
+ setNodeType(NodeTypeDestination);
}
AudioDestinationNode::~AudioDestinationNode()
Modified: trunk/Source/WebCore/webaudio/AudioGainNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioGainNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioGainNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -45,7 +45,7 @@
addInput(adoptPtr(new AudioNodeInput(this)));
addOutput(adoptPtr(new AudioNodeOutput(this, 1)));
- setType(NodeTypeGain);
+ setNodeType(NodeTypeGain);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/AudioNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -38,7 +38,7 @@
AudioNode::AudioNode(AudioContext* context, double sampleRate)
: m_isInitialized(false)
- , m_type(NodeTypeUnknown)
+ , m_nodeType(NodeTypeUnknown)
, m_context(context)
, m_sampleRate(sampleRate)
, m_lastProcessingTime(-1.0)
@@ -59,8 +59,8 @@
AudioNode::~AudioNode()
{
#if DEBUG_AUDIONODE_REFERENCES
- --s_nodeCount[type()];
- printf("%p: %d: AudioNode::~AudioNode() %d %d %d\n", this, type(), m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
+ --s_nodeCount[nodeType()];
+ printf("%p: %d: AudioNode::~AudioNode() %d %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
#endif
}
@@ -74,9 +74,9 @@
m_isInitialized = false;
}
-void AudioNode::setType(NodeType type)
+void AudioNode::setNodeType(NodeType type)
{
- m_type = type;
+ m_nodeType = type;
#if DEBUG_AUDIONODE_REFERENCES
++s_nodeCount[type];
@@ -196,7 +196,7 @@
}
#if DEBUG_AUDIONODE_REFERENCES
- printf("%p: %d: AudioNode::ref(%d) %d %d %d\n", this, type(), refType, m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
+ printf("%p: %d: AudioNode::ref(%d) %d %d %d\n", this, nodeType(), refType, m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
#endif
// See the disabling code in finishDeref() below. This handles the case where a node
@@ -268,7 +268,7 @@
}
#if DEBUG_AUDIONODE_REFERENCES
- printf("%p: %d: AudioNode::deref(%d) %d %d %d\n", this, type(), refType, m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
+ printf("%p: %d: AudioNode::deref(%d) %d %d %d\n", this, nodeType(), refType, m_normalRefCount, m_connectionRefCount, m_disabledRefCount);
#endif
if (!m_connectionRefCount) {
@@ -295,7 +295,7 @@
// because they no longer have any input connections. This needs to be handled more generally where AudioNodes have
// a tailTime attribute. Then the AudioNode only needs to remain "active" for tailTime seconds after there are no
// longer any active connections.
- if (type() != NodeTypeConvolver && type() != NodeTypeDelay) {
+ if (nodeType() != NodeTypeConvolver && nodeType() != NodeTypeDelay) {
m_isDisabled = true;
for (unsigned i = 0; i < m_outputs.size(); ++i)
output(i)->disable();
Modified: trunk/Source/WebCore/webaudio/AudioNode.h (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioNode.h 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioNode.h 2011-10-03 19:13:22 UTC (rev 96525)
@@ -74,8 +74,8 @@
NodeTypeEnd
};
- NodeType type() const { return m_type; }
- void setType(NodeType);
+ NodeType nodeType() const { return m_nodeType; }
+ void setNodeType(NodeType);
// We handle our own ref-counting because of the threading issues and subtle nature of
// how AudioNodes can continue processing (playing one-shot sound) after there are no more
@@ -148,7 +148,7 @@
private:
volatile bool m_isInitialized;
- NodeType m_type;
+ NodeType m_nodeType;
RefPtr<AudioContext> m_context;
double m_sampleRate;
Vector<OwnPtr<AudioNodeInput> > m_inputs;
Modified: trunk/Source/WebCore/webaudio/AudioPannerNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/AudioPannerNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/AudioPannerNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -62,7 +62,7 @@
m_orientation = FloatPoint3D(1, 0, 0);
m_velocity = FloatPoint3D(0, 0, 0);
- setType(NodeTypePanner);
+ setNodeType(NodeTypePanner);
initialize();
}
@@ -294,7 +294,7 @@
return;
// First check if this node is an AudioBufferSourceNode. If so, let it know about us so that doppler shift pitch can be taken into account.
- if (node->type() == NodeTypeAudioBufferSource) {
+ if (node->nodeType() == NodeTypeAudioBufferSource) {
AudioBufferSourceNode* bufferSourceNode = reinterpret_cast<AudioBufferSourceNode*>(node);
bufferSourceNode->setPannerNode(this);
} else {
Modified: trunk/Source/WebCore/webaudio/BiquadFilterNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/BiquadFilterNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/BiquadFilterNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -28,6 +28,8 @@
#include "BiquadFilterNode.h"
+#include "ExceptionCode.h"
+
namespace WebCore {
BiquadFilterNode::BiquadFilterNode(AudioContext* context, double sampleRate)
@@ -38,9 +40,19 @@
biquadProcessor()->parameter1()->setContext(context);
biquadProcessor()->parameter2()->setContext(context);
biquadProcessor()->parameter3()->setContext(context);
- setType(NodeTypeBiquadFilter);
+ setNodeType(NodeTypeBiquadFilter);
}
+void BiquadFilterNode::setType(unsigned short type, ExceptionCode& ec)
+{
+ if (type > BiquadProcessor::Allpass) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
+
+ biquadProcessor()->setType(static_cast<BiquadProcessor::FilterType>(type));
+}
+
} // namespace WebCore
#endif // ENABLE(WEB_AUDIO)
Modified: trunk/Source/WebCore/webaudio/BiquadFilterNode.h (96524 => 96525)
--- trunk/Source/WebCore/webaudio/BiquadFilterNode.h 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/BiquadFilterNode.h 2011-10-03 19:13:22 UTC (rev 96525)
@@ -52,7 +52,7 @@
}
unsigned short type() { return biquadProcessor()->type(); }
- void setType(unsigned short type) { biquadProcessor()->setType(static_cast<BiquadProcessor::FilterType>(type)); }
+ void setType(unsigned short type, ExceptionCode&);
AudioParam* frequency() { return biquadProcessor()->parameter1(); }
AudioParam* q() { return biquadProcessor()->parameter2(); }
Modified: trunk/Source/WebCore/webaudio/BiquadFilterNode.idl (96524 => 96525)
--- trunk/Source/WebCore/webaudio/BiquadFilterNode.idl 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/BiquadFilterNode.idl 2011-10-03 19:13:22 UTC (rev 96525)
@@ -37,7 +37,9 @@
const unsigned short NOTCH = 6;
const unsigned short ALLPASS = 7;
- attribute unsigned short type;
+ attribute unsigned short type
+ setter raises(DOMException);
+
readonly attribute AudioParam frequency; // in Hertz
readonly attribute AudioParam Q; // Quality factor
readonly attribute AudioParam gain; // in Decibels
Modified: trunk/Source/WebCore/webaudio/BiquadProcessor.h (96524 => 96525)
--- trunk/Source/WebCore/webaudio/BiquadProcessor.h 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/BiquadProcessor.h 2011-10-03 19:13:22 UTC (rev 96525)
@@ -67,7 +67,7 @@
AudioParam* parameter3() { return m_parameter3.get(); }
FilterType type() const { return m_type; }
- void setType(FilterType type) { m_type = type; }
+ void setType(FilterType type) { m_type = type; reset(); }
private:
FilterType m_type;
Modified: trunk/Source/WebCore/webaudio/ConvolverNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/ConvolverNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/ConvolverNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -51,7 +51,7 @@
addInput(adoptPtr(new AudioNodeInput(this)));
addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
- setType(NodeTypeConvolver);
+ setNodeType(NodeTypeConvolver);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/DelayNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/DelayNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/DelayNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -35,7 +35,7 @@
{
m_processor = adoptPtr(new DelayProcessor(sampleRate, 1));
delayTime()->setContext(context);
- setType(NodeTypeDelay);
+ setNodeType(NodeTypeDelay);
}
AudioParam* DelayNode::delayTime()
Modified: trunk/Source/WebCore/webaudio/DynamicsCompressorNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/DynamicsCompressorNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/DynamicsCompressorNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -41,7 +41,7 @@
addInput(adoptPtr(new AudioNodeInput(this)));
addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
- setType(NodeTypeDynamicsCompressor);
+ setNodeType(NodeTypeDynamicsCompressor);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/HighPass2FilterNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/HighPass2FilterNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/HighPass2FilterNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -37,7 +37,7 @@
biquadProcessor()->parameter1()->setContext(context);
biquadProcessor()->parameter2()->setContext(context);
biquadProcessor()->parameter3()->setContext(context);
- setType(NodeTypeHighPass2Filter);
+ setNodeType(NodeTypeHighPass2Filter);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/webaudio/_javascript_AudioNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/_javascript_AudioNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/_javascript_AudioNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -81,7 +81,7 @@
addInput(adoptPtr(new AudioNodeInput(this)));
addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
- setType(NodeTypeJavaScript);
+ setNodeType(NodeTypeJavaScript);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/LowPass2FilterNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/LowPass2FilterNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/LowPass2FilterNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -37,7 +37,7 @@
biquadProcessor()->parameter1()->setContext(context);
biquadProcessor()->parameter2()->setContext(context);
biquadProcessor()->parameter3()->setContext(context);
- setType(NodeTypeLowPass2Filter);
+ setNodeType(NodeTypeLowPass2Filter);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -46,7 +46,7 @@
// Default to stereo. This could change depending on what the media element .src is set to.
addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
- setType(NodeTypeMediaElementAudioSource);
+ setNodeType(NodeTypeMediaElementAudioSource);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -39,7 +39,7 @@
addInput(adoptPtr(new AudioNodeInput(this)));
addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
- setType(NodeTypeAnalyser);
+ setNodeType(NodeTypeAnalyser);
initialize();
}
Modified: trunk/Source/WebCore/webaudio/WaveShaperNode.cpp (96524 => 96525)
--- trunk/Source/WebCore/webaudio/WaveShaperNode.cpp 2011-10-03 19:01:28 UTC (rev 96524)
+++ trunk/Source/WebCore/webaudio/WaveShaperNode.cpp 2011-10-03 19:13:22 UTC (rev 96525)
@@ -35,7 +35,7 @@
: AudioBasicProcessorNode(context, context->sampleRate())
{
m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1));
- setType(NodeTypeWaveShaper);
+ setNodeType(NodeTypeWaveShaper);
}
void WaveShaperNode::setCurve(Float32Array* curve)
