Mirrors/Tone.js
2
0
Fork 0
mirror of https://github.com/Tonejs/Tone.js synced 2024-11-16 00:27:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge optionallly accepts more than 2 channels

Browse source
This commit is contained in:
tambien 2019-01-26 20:06:07 -05:00
parent 011f02858d
commit 4c0659a0ed
2 changed files with 45 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Tone/component/Merge.js
View file

@ -8,6 +8,7 @@ define(["../core/Tone", "../core/AudioNode"], function(Tone){
*
* @constructor
* @extends {Tone.AudioNode}
* @param {number} [channels=2] The number of channels to merge.
* @example
* var merge = new Tone.Merge().toMaster();
* //routing a sine tone in the left channel
@ -18,40 +19,42 @@ define(["../core/Tone", "../core/AudioNode"], function(Tone){
* noise.start();
* osc.start();
*/
Tone.Merge = function(){
Tone.Merge = function(channels){
//defaults to 2 channels
channels = Tone.defaultArg(channels, 2);
Tone.AudioNode.call(this);
this.createInsOuts(2, 0);
/**
* The left input channel.
* Alias for <code>input[0]</code>
* @type {GainNode}
*/
this.left = this.input[0] = new Tone.Gain();
/**
* The right input channel.
* Alias for <code>input[1]</code>.
* @type {GainNode}
*/
this.right = this.input[1] = new Tone.Gain();
this.createInsOuts(channels, 0);
/**
* the merger node for the two channels
* @type {ChannelMergerNode}
* @private
*/
this._merger = this.output = this.context.createChannelMerger(2);
this._merger = this.output = this.context.createChannelMerger(channels);
//connections
this.left.connect(this._merger, 0, 0);
this.right.connect(this._merger, 0, 1);
for (var i = 0; i < channels; i++){
this.input[i] = new Tone.Gain();
this.input[i].connect(this._merger, 0, i);
this.input[i].channelCount = 1;
this.input[i].channelCountMode = "explicit";
}
this.left.channelCount = 1;
this.right.channelCount = 1;
this.left.channelCountMode = "explicit";
this.right.channelCountMode = "explicit";
/**
* The left input channel.
* Alias for <code>input[0]</code>
* @type {GainNode}
*/
this.left = this.input[0];
/**
* The right input channel.
* Alias for <code>input[1]</code>.
* @type {GainNode}
*/
this.right = this.input[1];
};
Tone.extend(Tone.Merge, Tone.AudioNode);
@ -61,10 +64,11 @@ define(["../core/Tone", "../core/AudioNode"], function(Tone){
* @returns {Tone.Merge} this
*/
Tone.Merge.prototype.dispose = function(){
this.input.forEach(function(input){
input.dispose();
});
Tone.AudioNode.prototype.dispose.call(this);
this.left.dispose();
this.left = null;
this.right.dispose();
this.right = null;
this._merger.disconnect();
this._merger = null;

16
test/component/Merge.js
View file

@ -14,6 +14,22 @@ function(Merge, Basic, PassAudio, PassAudioStereo, Test, Offline, Signal){
merge.dispose();
});
it("defaults to two channels", function(){
var merge = new Merge();
expect(merge.numberOfInputs).to.equal(2);
merge.dispose();
});
it("can pass in more channels", function(){
var merge = new Merge(4);
expect(merge.numberOfInputs).to.equal(4);
Test.connect(merge, 0, 0);
Test.connect(merge, 0, 1);
Test.connect(merge, 0, 2);
Test.connect(merge, 0, 3);
merge.dispose();
});
it("passes the incoming signal through", function(){
return PassAudio(function(input){
var merge = new Merge().toMaster();