--- a/webaudio/specification.html Mon Oct 15 10:11:34 2012 -0700
+++ b/webaudio/specification.html Mon Oct 15 17:22:54 2012 -0700
@@ -172,14 +172,14 @@
Parameters</a></li>
</ul>
</li>
- <li><a href="#AudioGainNode">4.7. The AudioGainNode Interface</a>
+ <li><a href="#GainNode">4.7. The GainNode Interface</a>
<ul>
- <li><a href="#attributes-AudioGainNode">4.7.1. Attributes</a></li>
+ <li><a href="#attributes-GainNode">4.7.1. Attributes</a></li>
</ul>
</li>
<li><a href="#DelayNode">4.8. The DelayNode Interface</a>
<ul>
- <li><a href="#attributes-AudioGainNode_2">4.8.1. Attributes</a></li>
+ <li><a href="#attributes-GainNode_2">4.8.1. Attributes</a></li>
</ul>
</li>
<li><a href="#AudioBuffer">4.9. The AudioBuffer Interface</a>
@@ -200,10 +200,10 @@
</li>
<li><a href="#MediaElementAudioSourceNode">4.11. The
MediaElementAudioSourceNode Interface</a></li>
- <li><a href="#JavaScriptAudioNode">4.12. The JavaScriptAudioNode
+ <li><a href="#ScriptProcessorNode">4.12. The ScriptProcessorNode
Interface</a>
<ul>
- <li><a href="#attributes-JavaScriptAudioNode">4.12.1. Attributes</a></li>
+ <li><a href="#attributes-ScriptProcessorNode">4.12.1. Attributes</a></li>
</ul>
</li>
<li><a href="#AudioProcessingEvent">4.13. The AudioProcessingEvent
@@ -212,10 +212,10 @@
<li><a href="#attributes-AudioProcessingEvent">4.13.1. Attributes</a></li>
</ul>
</li>
- <li><a href="#AudioPannerNode">4.14. The AudioPannerNode Interface</a>
+ <li><a href="#PannerNode">4.14. The PannerNode Interface</a>
<ul>
- <li><a href="#AudioPannerNode-sub">4.14.1. Constants</a></li>
- <li><a href="#attributes-AudioPannerNode_attributes">4.14.2.
+ <li><a href="#PannerNode-sub">4.14.1. Constants</a></li>
+ <li><a href="#attributes-PannerNode_attributes">4.14.2.
Attributes</a></li>
<li><a href="#Methods_and_Parameters">4.14.3. Methods and
Parameters</a></li>
@@ -232,7 +232,7 @@
<li><a href="#attributes-ConvolverNode">4.16.1. Attributes</a></li>
</ul>
</li>
- <li><a href="#RealtimeAnalyserNode">4.17. The RealtimeAnalyserNode
+ <li><a href="#AnalyserNode">4.17. The AnalyserNode
Interface</a>
<ul>
<li><a href="#attributes-ConvolverNode_2">4.17.1. Attributes</a></li>
@@ -240,13 +240,13 @@
Parameters</a></li>
</ul>
</li>
- <li><a href="#AudioChannelSplitter">4.18. The AudioChannelSplitter
+ <li><a href="#ChannelSplitterNode">4.18. The ChannelSplitterNode
Interface</a>
<ul>
<li><a href="#example-1">Example:</a></li>
</ul>
</li>
- <li><a href="#AudioChannelMerger">4.19. The AudioChannelMerger Interface</a>
+ <li><a href="#ChannelMergerNode">4.19. The ChannelMergerNode Interface</a>
<ul>
<li><a href="#example-2">Example:</a></li>
</ul>
@@ -277,11 +277,11 @@
Attributes</a></li>
</ul>
</li>
- <li><a href="#Oscillator">4.23. The Oscillator Interface</a>
+ <li><a href="#OscillatorNode">4.23. The OscillatorNode Interface</a>
<ul>
- <li><a href="#attributes-Oscillator">4.23.1.
+ <li><a href="#attributes-OscillatorNode">4.23.1.
Attributes</a></li>
- <li><a href="#methodsandparams-Oscillator-section">4.23.2. Methods and
+ <li><a href="#methodsandparams-OscillatorNode-section">4.23.2. Methods and
Parameters</a></li>
</ul>
</li>
@@ -576,19 +576,19 @@
interface, an AudioNode which is the audio source from an
<code>audio</code>, <code>video</code>, or other media element. </li>
<li>A <a class="dfnref"
- href="#JavaScriptAudioNode-section">JavaScriptAudioNode</a> interface, an
+ href="#ScriptProcessorNode-section">ScriptProcessorNode</a> interface, an
AudioNode for generating or processing audio directly in JavaScript. </li>
<li>An <a class="dfnref"
href="#AudioProcessingEvent-section">AudioProcessingEvent</a> interface,
- which is an event type used with <code>JavaScriptAudioNode</code> objects.
+ which is an event type used with <code>ScriptProcessorNode</code> objects.
</li>
<li>An <a class="dfnref" href="#AudioParam-section">AudioParam</a> interface,
for controlling an individual aspect of an AudioNode's functioning, such as
volume. </li>
- <li>An <a class="dfnref" href="#AudioGainNode-section">AudioGainNode</a>
+ <li>An <a class="dfnref" href="#GainNode-section">GainNode</a>
interface, for explicit gain control. Because inputs to AudioNodes support
multiple connections (as a unity-gain summing junction), mixers can be <a
- href="#MixerGainStructure-section">easily built</a> with AudioGainNodes.
+ href="#MixerGainStructure-section">easily built</a> with GainNodes.
</li>
<li>A <a class="dfnref" href="#BiquadFilterNode-section">BiquadFilterNode</a>
interface, an AudioNode for common low-order filters such as:
@@ -605,24 +605,24 @@
</li>
<li>A <a class="dfnref" href="#DelayNode-section">DelayNode</a> interface, an
AudioNode which applies a dynamically adjustable variable delay. </li>
- <li>An <a class="dfnref" href="#AudioPannerNode-section">AudioPannerNode</a>
+ <li>An <a class="dfnref" href="#PannerNode-section">PannerNode</a>
interface, for spatializing / positioning audio in 3D space. </li>
<li>An <a class="dfnref" href="#AudioListener-section">AudioListener</a>
- interface, which works with an <code>AudioPannerNode</code> for
+ interface, which works with an <code>PannerNode</code> for
spatialization. </li>
<li>A <a class="dfnref" href="#ConvolverNode-section">ConvolverNode</a>
interface, an AudioNode for applying a <a
href="#Convolution-section">real-time linear effect</a> (such as the sound
of a concert hall). </li>
<li>A <a class="dfnref"
- href="#RealtimeAnalyserNode-section">RealtimeAnalyserNode</a> interface,
+ href="#AnalyserNode-section">AnalyserNode</a> interface,
for use with music visualizers, or other visualization applications. </li>
<li>A <a class="dfnref"
- href="#AudioChannelSplitter-section">AudioChannelSplitter</a> interface,
+ href="#ChannelSplitterNode-section">ChannelSplitterNode</a> interface,
for accessing the individual channels of an audio stream in the routing
graph. </li>
<li>A <a class="dfnref"
- href="#AudioChannelMerger-section">AudioChannelMerger</a> interface, for
+ href="#ChannelMergerNode-section">ChannelMergerNode</a> interface, for
combining channels from multiple audio streams into a single audio stream.
</li>
<li>A DynamicsProcessorNode interface, an
@@ -728,25 +728,24 @@
MediaStreamAudioSourceNode createMediaStreamSource(MediaStream mediaStream);
- JavaScriptAudioNode createJavaScriptNode(unsigned long bufferSize,
+ ScriptProcessorNode createJavaScriptNode(unsigned long bufferSize,
optional unsigned long numberOfInputChannels = 2,
optional unsigned long numberOfOutputChannels = 2);
- RealtimeAnalyserNode createAnalyser();
- AudioGainNode createGainNode();
+ AnalyserNode createAnalyser();
+ GainNode createGainNode();
DelayNode createDelayNode(optional double maxDelayTime);
BiquadFilterNode createBiquadFilter();
WaveShaperNode createWaveShaper();
- AudioPannerNode createPanner();
+ PannerNode createPanner();
ConvolverNode createConvolver();
- AudioChannelSplitter createChannelSplitter(optional unsigned long numberOfOutputs = 6);
-
- AudioChannelMerger createChannelMerger(optional unsigned long numberOfInputs = 6);
+ ChannelSplitterNode createChannelSplitter(optional unsigned long numberOfOutputs = 6);
+ ChannelMergerNode createChannelMerger(optional unsigned long numberOfInputs = 6);
DynamicsCompressorNode createDynamicsCompressor();
- Oscillator createOscillator();
+ OscillatorNode createOscillator();
WaveTable createWaveTable(Float32Array real, Float32Array imag);
};
@@ -878,7 +877,7 @@
<dt id="dfn-createJavaScriptNode">The <code>createJavaScriptNode</code>
method</dt>
<dd><p>Creates a <a
- href="#JavaScriptAudioNode"><code>JavaScriptAudioNode</code></a> for
+ href="#ScriptProcessorNode"><code>ScriptProcessorNode</code></a> for
direct audio processing using JavaScript. An exception will be thrown if <code>bufferSize</code> or <code>numberOfInputChannels</code> or <code>numberOfOutputChannels</code>
are outside the valid range. </p>
<p>The <dfn id="dfn-bufferSize">bufferSize</dfn> parameter determines the
@@ -902,13 +901,13 @@
<dl>
<dt id="dfn-createAnalyser">The <code>createAnalyser</code> method</dt>
<dd><p>Creates a <a
- href="#RealtimeAnalyserNode-section"><code>RealtimeAnalyserNode</code></a>.</p>
+ href="#AnalyserNode-section"><code>AnalyserNode</code></a>.</p>
</dd>
</dl>
<dl>
<dt id="dfn-createGainNode">The <code>createGainNode</code> method</dt>
<dd><p>Creates an <a
- href="#AudioGainNode-section"><code>AudioGainNode</code></a>.</p>
+ href="#GainNode-section"><code>GainNode</code></a>.</p>
</dd>
</dl>
<dl>
@@ -941,7 +940,7 @@
<dl>
<dt id="dfn-createPanner">The <code>createPanner</code> method</dt>
<dd><p>Creates an <a
- href="#AudioPannerNode-section"><code>AudioPannerNode</code></a>.</p>
+ href="#PannerNode-section"><code>PannerNode</code></a>.</p>
</dd>
</dl>
<dl>
@@ -954,7 +953,7 @@
<dt id="dfn-createChannelSplitter">The <code>createChannelSplitter</code>
method</dt>
<dd><p>Creates an <a
- href="#AudioChannelSplitter-section"><code>AudioChannelSplitter</code></a>
+ href="#ChannelSplitterNode-section"><code>ChannelSplitterNode</code></a>
representing a channel splitter. An exception will be thrown for invalid parameter values.</p>
<p>The <dfn id="dfn-numberOfOutputs">numberOfOutputs</dfn> parameter
determines the number of outputs. Values of up to 32 must be supported. If not specified, then 6 will be used. </p>
@@ -964,7 +963,7 @@
<dt id="dfn-createChannelMerger">The <code>createChannelMerger</code>
method</dt>
<dd><p>Creates an <a
- href="#AudioChannelMerger-section"><code>AudioChannelMerger</code></a>
+ href="#ChannelMergerNode-section"><code>ChannelMergerNode</code></a>
representing a channel merger. An exception will be thrown for invalid parameter values.</p>
<p>The <dfn id="dfn-numberOfInputs">numberOfInputs</dfn> parameter
determines the number of inputs. Values of up to 32 must be supported. If not specified, then 6 will be used. </p>
@@ -981,7 +980,7 @@
<dt id="dfn-createOscillator">The
<code>createOscillator</code> method</dt>
<dd><p>Creates an <a
- href="#Oscillator-section"><code>Oscillator</code></a>.</p>
+ href="#OscillatorNode-section"><code>OscillatorNode</code></a>.</p>
</dd>
</dl>
<dl>
@@ -993,9 +992,9 @@
lengths greater than zero and less than or equal to 4096 or an exception will be thrown.
These parameters specify the Fourier coefficients of a
<a href="http://en.wikipedia.org/wiki/Fourier_series">Fourier series</a> representing the partials of a periodic waveform.
- The created WaveTable will be used with an <a href="#Oscillator-section"><code>Oscillator</code></a>
+ The created WaveTable will be used with an <a href="#OscillatorNode-section"><code>OscillatorNode</code></a>
and will represent a <em>normalized</em> time-domain waveform having maximum absolute peak value of 1.
- Another way of saying this is that the generated waveform of an <a href="#Oscillator-section"><code>Oscillator</code></a>
+ Another way of saying this is that the generated waveform of an <a href="#OscillatorNode-section"><code>OscillatorNode</code></a>
will have maximum peak value at 0dBFS. Conveniently, this corresponds to the full-range of the signal values used by the Web Audio API.
Because the WaveTable will be normalized on creation, the <code>real</code> and <code>imag</code> parameters
represent <em>relative</em> values.
@@ -1657,11 +1656,11 @@
</div>
</div>
-<div id="AudioGainNode-section" class="section">
-<h2 id="AudioGainNode">4.7. The AudioGainNode Interface</h2>
+<div id="GainNode-section" class="section">
+<h2 id="GainNode">4.7. The GainNode Interface</h2>
<p>Changing the gain of an audio signal is a fundamental operation in audio
-applications. The <code>AudioGainNode</code> is one of the building blocks for creating <a
+applications. The <code>GainNode</code> is one of the building blocks for creating <a
href="#MixerGainStructure-section">mixers</a>.
This interface is an AudioNode with a single input and single
output: </p>
@@ -1701,7 +1700,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-AudioGainNode">AudioGainNode</dfn> : AudioNode {
+interface <dfn id="dfn-GainNode">GainNode</dfn> : AudioNode {
AudioParam gain;
@@ -1710,8 +1709,8 @@
</div>
</div>
-<div id="attributes-AudioGainNode-section" class="section">
-<h3 id="attributes-AudioGainNode">4.7.1. Attributes</h3>
+<div id="attributes-GainNode-section" class="section">
+<h3 id="attributes-GainNode">4.7.1. Attributes</h3>
<dl>
<dt id="dfn-gain"><code>gain</code></dt>
<dd><p>Represents the amount of gain to apply. Its
@@ -1754,8 +1753,8 @@
</div>
</div>
-<div id="attributes-AudioGainNode-section_2" class="section">
-<h3 id="attributes-AudioGainNode_2">4.8.1. Attributes</h3>
+<div id="attributes-GainNode-section_2" class="section">
+<h3 id="attributes-GainNode_2">4.8.1. Attributes</h3>
<dl>
<dt id="dfn-delayTime_2"><code>delayTime</code></dt>
<dd><p>An AudioParam object representing the amount of delay (in seconds)
@@ -2036,8 +2035,8 @@
</div>
-<div id="JavaScriptAudioNode-section" class="section">
-<h2 id="JavaScriptAudioNode">4.12. The JavaScriptAudioNode Interface</h2>
+<div id="ScriptProcessorNode-section" class="section">
+<h2 id="ScriptProcessorNode">4.12. The ScriptProcessorNode Interface</h2>
<p>This interface is an AudioNode which can generate, process, or analyse audio
directly using JavaScript. </p>
@@ -2045,7 +2044,7 @@
numberOfOutputs : 1
</pre>
-<p>The JavaScriptAudioNode is constructed with a <code>bufferSize</code> which
+<p>The ScriptProcessorNode is constructed with a <code>bufferSize</code> which
must be one of the following values: 256, 512, 1024, 2048, 4096, 8192, 16384.
This value controls how frequently the <code>onaudioprocess</code> event
handler is called and how many sample-frames need to be processed each call.
@@ -2069,7 +2068,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-JavaScriptAudioNode">JavaScriptAudioNode</dfn> : AudioNode {
+interface <dfn id="dfn-ScriptProcessorNode">ScriptProcessorNode</dfn> : AudioNode {
attribute EventListener onaudioprocess;
@@ -2080,8 +2079,8 @@
</div>
</div>
-<div id="attributes-JavaScriptAudioNode-section" class="section">
-<h3 id="attributes-JavaScriptAudioNode">4.12.1. Attributes</h3>
+<div id="attributes-ScriptProcessorNode-section" class="section">
+<h3 id="attributes-ScriptProcessorNode">4.12.1. Attributes</h3>
<dl>
<dt id="dfn-onaudioprocess"><code>onaudioprocess</code></dt>
<dd><p>An event listener which is called periodically for audio processing.
@@ -2091,7 +2090,7 @@
</dd>
</dl>
<dl>
- <dt id="dfn-bufferSize_JavaScriptAudioNode"><code>bufferSize</code></dt>
+ <dt id="dfn-bufferSize_ScriptProcessorNode"><code>bufferSize</code></dt>
<dd><p>The size of the buffer (in sample-frames) which needs to be
processed each time <code>onprocessaudio</code> is called. Legal values
are (256, 512, 1024, 2048, 4096, 8192, 16384). </p>
@@ -2105,7 +2104,7 @@
<p>This interface is a type of <code>Event</code> which is passed to the
<code>onaudioprocess</code> event handler used by <a
-href="#JavaScriptAudioNode-section"><code>JavaScriptAudioNode</code></a>. </p>
+href="#ScriptProcessorNode-section"><code>ScriptProcessorNode</code></a>. </p>
<p>The event handler processes audio from the input (if any) by accessing the
audio data from the <code>inputBuffer</code> attribute. The audio data which is
@@ -2122,7 +2121,7 @@
interface <dfn id="dfn-AudioProcessingEvent">AudioProcessingEvent</dfn> : Event {
- attribute JavaScriptAudioNode node;
+ attribute ScriptProcessorNode node;
readonly attribute float playbackTime;
readonly attribute AudioBuffer inputBuffer;
readonly attribute AudioBuffer outputBuffer;
@@ -2136,7 +2135,7 @@
<h3 id="attributes-AudioProcessingEvent">4.13.1. Attributes</h3>
<dl>
<dt id="dfn-node"><code>node</code></dt>
- <dd><p>The <code>JavaScriptAudioNode</code> associated with this processing
+ <dd><p>The <code>ScriptProcessorNode</code> associated with this processing
event. </p>
</dd>
</dl>
@@ -2167,8 +2166,8 @@
</div>
</div>
-<div id="AudioPannerNode-section" class="section">
-<h2 id="AudioPannerNode">4.14. The AudioPannerNode Interface</h2>
+<div id="PannerNode-section" class="section">
+<h2 id="PannerNode">4.14. The PannerNode Interface</h2>
<p>This interface represents a processing node which <a
href="#Spatialization-section">positions / spatializes</a> an incoming audio
@@ -2199,7 +2198,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-AudioPannerNode">AudioPannerNode</dfn> : AudioNode {
+interface <dfn id="dfn-PannerNode">PannerNode</dfn> : AudioNode {
<span class="comment">// Panning model </span>
const unsigned short EQUALPOWER = 0;
@@ -2240,8 +2239,8 @@
</div>
</div>
-<div id="AudioPannerNode-sub-section" class="section">
-<h3 id="AudioPannerNode-sub">4.14.1. Constants</h3>
+<div id="PannerNode-sub-section" class="section">
+<h3 id="PannerNode-sub">4.14.1. Constants</h3>
<dl>
<dt id="dfn-EQUALPOWER"><code>EQUALPOWER</code></dt>
<dd><p>A simple and efficient spatialization algorithm using equal-power
@@ -2287,10 +2286,10 @@
</dl>
</div>
-<div id="attributes-AudioPannerNode_attributes-section" class="section">
-<h3 id="attributes-AudioPannerNode_attributes">4.14.2. Attributes</h3>
+<div id="attributes-PannerNode_attributes-section" class="section">
+<h3 id="attributes-PannerNode_attributes">4.14.2. Attributes</h3>
<dl>
- <dt id="dfn-listener_AudioPannerNode_attributes"><code>listener</code></dt>
+ <dt id="dfn-listener_PannerNode_attributes"><code>listener</code></dt>
<dd><p>Represents the <b>listener</b> whose position and orientation is
used together with the panner's position and orientation to determine how
the audio will be spatialized. </p>
@@ -2385,7 +2384,7 @@
<p>This interface represents the position and orientation of the person
listening to the audio scene. All <a
-href="#AudioPannerNode-section"><code>AudioPannerNode</code></a> objects
+href="#PannerNode-section"><code>PannerNode</code></a> objects
spatialize in relation to the AudioContext's <code>listener</code>. See <a
href="#Spatialization-section">this</a> section for more details about
spatialization. </p>
@@ -2437,7 +2436,7 @@
<dl>
<dt id="dfn-setPosition_2">The <code>setPosition</code> method</dt>
<dd><p>Sets the position of the listener in a 3D cartesian coordinate
- space. <code>AudioPannerNode</code> objects use this position relative to
+ space. <code>PannerNode</code> objects use this position relative to
individual audio sources for spatialization.</p>
<p>The <dfn id="dfn-x_AudioListener">x, y, z</dfn> parameters represent
the coordinates in 3D space. </p>
@@ -2601,8 +2600,8 @@
</div>
-<div id="RealtimeAnalyserNode-section" class="section">
-<h2 id="RealtimeAnalyserNode">4.17. The RealtimeAnalyserNode Interface</h2>
+<div id="AnalyserNode-section" class="section">
+<h2 id="AnalyserNode">4.17. The AnalyserNode Interface</h2>
<p>This interface represents a node which is able to provide real-time
frequency and time-domain <a href="#RealtimeAnalysis-section">analysis</a>
@@ -2620,7 +2619,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-RealtimeAnalyserNode">RealtimeAnalyserNode</dfn> : AudioNode {
+interface <dfn id="dfn-AnalyserNode">AnalyserNode</dfn> : AudioNode {
<span class="comment">// Real-time frequency-domain data </span>
void getFloatFrequencyData(Float32Array array);
@@ -2708,12 +2707,12 @@
</dd>
</dl>
-<div id="AudioChannelSplitter-section" class="section">
-<h2 id="AudioChannelSplitter">4.18. The AudioChannelSplitter Interface</h2>
-
-<p>The <code>AudioChannelSplitter</code> is for use in more advanced
+<div id="ChannelSplitterNode-section" class="section">
+<h2 id="ChannelSplitterNode">4.18. The ChannelSplitterNode Interface</h2>
+
+<p>The <code>ChannelSplitterNode</code> is for use in more advanced
applications and would often be used in conjunction with <a
-href="#AudioChannelMerger-section"><code>AudioChannelMerger</code></a>. </p>
+href="#ChannelMergerNode-section"><code>ChannelMergerNode</code></a>. </p>
<pre> numberOfInputs : 1
numberOfOutputs : Variable N (defaults to 6) // number of "active" (non-silent) outputs is determined by number of channels in the input
</pre>
@@ -2722,7 +2721,7 @@
of an audio stream in the routing graph. It has a single input, and a number of
"active" outputs which equals the number of channels in the input audio stream.
For example, if a stereo input is connected to an
-<code>AudioChannelSplitter</code> then the number of active outputs will be two
+<code>ChannelSplitterNode</code> then the number of active outputs will be two
(one from the left channel and one from the right). There are always a total
number of N outputs (determined by the <code>numberOfOutputs</code> parameter to the AudioContext method <code>createChannelSplitter()</code>),
The default number is 6 if this value is not provided. Any outputs
@@ -2735,7 +2734,7 @@
<p>Please note that in this example, the splitter does <b>not</b> interpret the channel identities (such as left, right, etc.), but
simply splits out channels in the order that they are input.</p>
-<p>One application for <code>AudioChannelSplitter</code> is for doing "matrix
+<p>One application for <code>ChannelSplitterNode</code> is for doing "matrix
mixing" where individual gain control of each channel is desired. </p>
<div class="block">
@@ -2746,7 +2745,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-AudioChannelSplitter">AudioChannelSplitter</dfn> : AudioNode {
+interface <dfn id="dfn-ChannelSplitterNode">ChannelSplitterNode</dfn> : AudioNode {
};
</code></pre>
@@ -2754,12 +2753,12 @@
</div>
</div>
-<div id="AudioChannelMerger-section" class="section">
-<h2 id="AudioChannelMerger">4.19. The AudioChannelMerger Interface</h2>
-
-<p>The <code>AudioChannelMerger</code> is for use in more advanced applications
+<div id="ChannelMergerNode-section" class="section">
+<h2 id="ChannelMergerNode">4.19. The ChannelMergerNode Interface</h2>
+
+<p>The <code>ChannelMergerNode</code> is for use in more advanced applications
and would often be used in conjunction with <a
-href="#AudioChannelSplitter-section"><code>AudioChannelSplitter</code></a>. </p>
+href="#ChannelSplitterNode-section"><code>ChannelSplitterNode</code></a>. </p>
<pre> numberOfInputs : Variable N (default to 6) // number of connected inputs may be less than this
numberOfOutputs : 1
</pre>
@@ -2768,7 +2767,7 @@
audio streams into a single audio stream. It has a variable number of inputs (defaulting to 6), but not all of them
need be connected. There is a single output whose audio stream has a number of
channels equal to the sum of the numbers of channels of all the connected
-inputs. For example, if an <code>AudioChannelMerger</code> has two connected
+inputs. For example, if an <code>ChannelMergerNode</code> has two connected
inputs (both stereo), then the output will be four channels, the first two from
the first input and the second two from the second input. In another example
with two connected inputs (both mono), the output will be two channels
@@ -2782,11 +2781,11 @@
simply combines channels in the order that they are input.</p>
-<p>Be aware that it is possible to connect an <code>AudioChannelMerger</code>
+<p>Be aware that it is possible to connect an <code>ChannelMergerNode</code>
in such a way that it outputs an audio stream with a large number of channels
greater than the maximum supported by the audio hardware. In this case where such an output is connected
to the AudioContext .destination (the audio hardware), then the extra channels will be ignored.
-Thus, the <code>AudioChannelMerger</code> should be used in situations where the number
+Thus, the <code>ChannelMergerNode</code> should be used in situations where the number
of channels is well understood. </p>
<div class="block">
@@ -2797,7 +2796,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-AudioChannelMerger">AudioChannelMerger</dfn> : AudioNode {
+interface <dfn id="dfn-ChannelMergerNode">ChannelMergerNode</dfn> : AudioNode {
};
</code></pre>
@@ -3170,14 +3169,14 @@
</div>
</div>
-<div id="Oscillator-section" class="section">
-<h2 id="Oscillator">4.23. The Oscillator Interface</h2>
-
-<p>Oscillator represents an audio source generating a periodic waveform. It can be set to
+<div id="OscillatorNode-section" class="section">
+<h2 id="OscillatorNode">4.23. The OscillatorNode Interface</h2>
+
+<p>OscillatorNode represents an audio source generating a periodic waveform. It can be set to
a few commonly used waveforms. Additionally, it can be set to an arbitrary periodic
waveform through the use of a <a href="#WaveTable-section"><code>WaveTable</code></a> object. </p>
-<p>Oscillators are common foundational building blocks in audio synthesis. An Oscillator will start emitting sound at the time
+<p>Oscillators are common foundational building blocks in audio synthesis. An OscillatorNode will start emitting sound at the time
specified by the <code>start()</code> method. </p>
<p>
@@ -3210,7 +3209,7 @@
</pre>
<p>
-The Oscillator's instantaneous phase at each time is the time integral of <em>computedFrequency</em>.
+The OscillatorNode's instantaneous phase at each time is the time integral of <em>computedFrequency</em>.
</p>
<pre> numberOfInputs : 0
@@ -3225,7 +3224,7 @@
<div class="blockContent">
<pre class="code"><code class="idl-code">
-interface <dfn id="dfn-Oscillator">Oscillator</dfn> : AudioSourceNode {
+interface <dfn id="dfn-OscillatorNode">OscillatorNode</dfn> : AudioSourceNode {
// Type constants.
const unsigned short SINE = 0;
@@ -3255,8 +3254,8 @@
</div>
</div>
-<div id="attributes-Oscillator-section" class="section">
-<h3 id="attributes-Oscillator">4.23.1. Attributes</h3>
+<div id="attributes-OscillatorNode-section" class="section">
+<h3 id="attributes-OscillatorNode">4.23.1. Attributes</h3>
<dl>
<dt id="dfn-type"><code>type</code></dt>
<dd><p>The shape of the periodic waveform. It may directly be set to any of the type constant values except for CUSTOM.
@@ -3284,8 +3283,8 @@
</div>
</div>
-<div id="methodsandparams-Oscillator-section" class="section">
-<h3 id="methodsandparams-Oscillator">4.23.2. Methods and Parameters</h3>
+<div id="methodsandparams-OscillatorNode-section" class="section">
+<h3 id="methodsandparams-OscillatorNode">4.23.2. Methods and Parameters</h3>
<dl>
<dt id="dfn-setWaveTable">The <code>setWaveTable</code>
method</dt>
@@ -3310,7 +3309,7 @@
<div id="WaveTable-section" class="section">
<h2 id="WaveTable">4.24. The WaveTable Interface</h2>
-<p>WaveTable represents an arbitrary periodic waveform to be used with an <a href="#Oscillator-section"><code>Oscillator</code></a>.
+<p>WaveTable represents an arbitrary periodic waveform to be used with an <a href="#OscillatorNode-section"><code>OscillatorNode</code></a>.
Please see <a href="#dfn-createWaveTable">createWaveTable()</a> and <a href="#dfn-setWaveTable">setWaveTable()</a> and for more details. </p>
<div class="block">
@@ -3389,11 +3388,11 @@
<p>But many times, it's important to be able to control the gain for each of
the output signals. The <a
-href="#AudioGainNode-section"><code>AudioGainNode</code></a> gives this
+href="#GainNode-section"><code>GainNode</code></a> gives this
control: </p>
<img alt="mixer architecture new" src="images/mixer-architecture-new.png" />
-<p>Using these two concepts of unity gain summing junctions and AudioGainNodes,
+<p>Using these two concepts of unity gain summing junctions and GainNodes,
it's possible to construct simple or complex mixing scenarios. </p>
<h3 id="Example-mixer-with-send-busses">Example: Mixer with Send Busses</h3>
@@ -3412,7 +3411,7 @@
"main bus" are actually inputs to AudioNodes, but here are represented as
summing busses, where the intersections g2_1, g3_1, etc. represent the "gain"
or volume for the given source on the given mixer. In order to expose this
-gain, an <a href="#dfn-AudioGainNode"><code>AudioGainNode</code></a> is used:
+gain, an <a href="#dfn-GainNode"><code>GainNode</code></a> is used:
</p>
<p>Here's how the above diagram could be constructed in JavaScript: </p>
@@ -3767,11 +3766,11 @@
engines such as OpenAL, FMOD, Creative's EAX, Microsoft's XACT Audio, etc. have
this ability. </p>
-<p>Using an <code>AudioPannerNode</code>, an audio stream can be spatialized or
+<p>Using an <code>PannerNode</code>, an audio stream can be spatialized or
positioned in space relative to an <code>AudioListener</code>. An <a
href="#AudioContext-section"><code>AudioContext</code></a> will contain a
single <code>AudioListener</code>. Both panners and listeners have a position
-in 3D space using a right-handed cartesian coordinate system. <code>AudioPannerNode</code>
+in 3D space using a right-handed cartesian coordinate system. <code>PannerNode</code>
objects (representing the source stream) have an <code>orientation</code>
vector representing in which direction the sound is projecting. Additionally,
they have a <code>sound cone</code> representing how directional the sound is.
@@ -3786,7 +3785,7 @@
doppler shift effect which changes the pitch. </p>
<p>
-During rendering, the <code>AudioPannerNode</code> calculates an <em>azimuth</em>
+During rendering, the <code>PannerNode</code> calculates an <em>azimuth</em>
and <em>elevation</em>. These values are used internally by the implementation in
order to render the spatialization effect. See the <a href="#Spatialization-panning-algorithm">Panning Algorithm</a> section
for details of how these values are used.
@@ -3979,10 +3978,10 @@
<p>
<em>distance</em> will then be used to calculate <em>distanceGain</em> which depends
-on the <em>distanceModel</em> attribute. See the <a href="#AudioPannerNode-sub">Constants</a> section for details of
+on the <em>distanceModel</em> attribute. See the <a href="#PannerNode-sub">Constants</a> section for details of
how this is calculated for each distance model.
</p>
-<p>As part of its processing, the <code>AudioPannerNode</code> scales/multiplies the input audio signal by <em>distanceGain</em>
+<p>As part of its processing, the <code>PannerNode</code> scales/multiplies the input audio signal by <em>distanceGain</em>
to make distant sounds quieter and nearer ones louder.
</p>
@@ -4072,7 +4071,7 @@
The subset of N, M, K below must be implemented (note that the first image in the diagram is just illustrating
the general case and is not normative, while the following images are normative).
Without loss of generality, developers desiring more complex and arbitrary matrixing can use multiple <code>ConvolverNode</code>
-objects in conjunction with an <code>AudioChannelMerger</code>.
+objects in conjunction with an <code>ChannelMergerNode</code>.
</p>
@@ -4161,7 +4160,7 @@
demos. This specification includes a means of synthesizing and processing
directly using JavaScript by using a special subtype of <a
href="#AudioNode-section"><code>AudioNode</code></a> called <a
-href="#JavaScriptAudioNode-section"><code>JavaScriptAudioNode</code></a>. </p>
+href="#ScriptProcessorNode-section"><code>ScriptProcessorNode</code></a>. </p>
<p>Here are some interesting examples where direct JavaScript processing can be
useful: </p>
@@ -4308,7 +4307,7 @@
</p>
<p>In addition to the convolution effect. The <a
-href="#AudioPannerNode-section"><code>AudioPannerNode</code></a> may also be
+href="#PannerNode-section"><code>PannerNode</code></a> may also be
expensive if using the HRTF panning model. For slower devices, a cheaper
algorithm such as EQUALPOWER can be used to conserve compute resources. </p>
@@ -4491,7 +4490,7 @@
characteristic features of the client (such as audio hardware sample-rate) to
any page that makes use of the AudioNode interface. Additionally, timing
information can be collected through the RealtimeAnalyzerNode or
-JavaScriptAudioNode interface. The information could subsequently be used to
+ScriptProcessorNode interface. The information could subsequently be used to
create a fingerprint of the client. </p>
<p>Currently audio input is not specified in this document, but it will involve
@@ -4518,8 +4517,8 @@
AudioBufferSourceNode.noteGrainOn() has been changed to <b>start()</b>
AudioBufferSourceNode.noteOff() has been changed to <b>stop()</b>
-Oscillator.noteOn() has been changed to <b>start()</b>
-Oscillator.noteOff() has been changed to <b>stop()</b>
+OscillatorNode.noteOn() has been changed to <b>start()</b>
+OscillatorNode.noteOff() has been changed to <b>stop()</b>
AudioParam.setTargetValueAtTime() has been changed to <b>setTargetAtTime()</b>
</pre>
@@ -4613,7 +4612,7 @@
*Add much more detail about parameter automation, including an example
date: Mon Jun 04 17:25:08 2012 -0700
-* ISSUE-85: Oscillator folding considerations
+* ISSUE-85: OscillatorNode folding considerations
date: Mon Jun 04 17:02:20 2012 -0700
* ISSUE-45: AudioGain scale underdefined
@@ -4667,7 +4666,7 @@
* fix two small typos reported by James Wei
date: Tue Apr 24 12:27:11 2012 -0700
-* small cleanup to AudioChannelSplitter and AudioChannelMerger
+* small cleanup to ChannelSplitterNode and ChannelMergerNode
date: Tue Apr 17 11:35:56 2012 -0700
* small fix to createWaveTable()
@@ -4677,7 +4676,7 @@
* Add AudioNode connect() to AudioParam method.
date: Tue Apr 13 2012
-* Add Oscillator and WaveTable
+* Add OscillatorNode and WaveTable
* Define default values for optional arguments in createJavaScriptNode(), createChannelSplitter(), createChannelMerger()
* Define default filter type for BiquadFilterNode as LOWPASS
@@ -4693,9 +4692,9 @@
* remove AudioBufferSourceNode .gain attribute
* remove AudioListener .gain attribute
* add AudioBufferSourceNode .playbackState attribute and state constants
-* RealtimeAnalyserNode no longer requires its output be connected to anything
-* update AudioChannelMerger section describing numberOfOutputs (defaults to 6 but settable in constructor)
-* update AudioChannelSplitter section describing numberOfInputs (defaults to 6 but settable in constructor)
+* AnalyserNode no longer requires its output be connected to anything
+* update ChannelMergerNode section describing numberOfOutputs (defaults to 6 but settable in constructor)
+* update ChannelSplitterNode section describing numberOfInputs (defaults to 6 but settable in constructor)
* add note in Spatialization sections about potential to get arbitrary convolution matrixing
date: Tue Apr 10 2012
@@ -4719,8 +4718,8 @@
* upgrade noteOn(), noteGrainOn(), noteOff() times to double from float
date: Mon Feb 06 16:52:39 2012 -0800
-* Cleanup JavaScriptAudioNode section
-* Add distance model constants for AudioPannerNode according to the OpenAL spec
+* Cleanup ScriptProcessorNode section
+* Add distance model constants for PannerNode according to the OpenAL spec
* Add .normalize attribute to ConvolverNode
* Add getFrequencyResponse() method to BiquadFilterNode
* Tighten up the up-mix equations