Skip to content

Commit 121efb1

Browse files
committed
InputMerge examples
1 parent 47de4d9 commit 121efb1

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

examples/examples-stream/streams-generator-merge-pwm/streams-generator-merge-pwm.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void setup() {
2727
sineWave2.begin(info_in, N_B5);
2828

2929
// merge input to stereo
30-
imerge.add(sound1);
31-
imerge.add(sound2);
30+
imerge.add(sound1, 1);
31+
imerge.add(sound2, 1);
3232
imerge.begin(info_out);
3333

3434
// setup PWM output

examples/tests/conversion/channel-converter-avg/channel-converter-avg.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void setup(void) {
3333
sineWave2.begin(info1, N_B5);
3434

3535
// Merge input to stereo
36-
imerge.add(sound1);
37-
imerge.add(sound2);
36+
imerge.add(sound1, 1);
37+
imerge.add(sound2, 1);
3838
imerge.begin(info2);
3939

4040
// Define CSV Output

examples/tests/conversion/channel-converter-bin/channel-converter-bin.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ void setup(void) {
3636
sineWave2.begin(info1, N_B5);
3737

3838
// Merge input to stereo
39-
imerge.add(sound1);
40-
imerge.add(sound2);
39+
imerge.add(sound1, 1);
40+
imerge.add(sound2, 1);
4141
imerge.begin(info2);
4242

4343
// Configure binning

examples/tests/conversion/channel-converter-bindiff/channel-converter-bindiff.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ void setup(void) {
3535
sineWave2.begin(info1, N_B5);
3636

3737
// Merge input to stereo
38-
imerge.add(sound1);
39-
imerge.add(sound2);
38+
imerge.add(sound1, 1);
39+
imerge.add(sound2, 1);
4040
imerge.begin(info2);
4141

4242
// Setup binning

examples/tests/conversion/channel-converter-diff/channel-converter-diff.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void setup(void) {
3333
sineWave2.begin(info1, N_B5);
3434

3535
// Merge input to stereo
36-
imerge.add(sound1);
37-
imerge.add(sound2);
36+
imerge.add(sound1, 1);
37+
imerge.add(sound2, 1);
3838
imerge.begin(info2);
3939

4040
// Define CSV Output

examples/tests/etc/test-tdm/test-tdm.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void setup(void) {
3636
sound[j].setInput(sineWaves[j]);
3737
sound[j].begin(info_in);
3838
// setup merge input stream channels
39-
imerge.add(sound[j]);
39+
imerge.add(sound[j], 1);
4040
}
4141

4242
// setup DAC pins

tests-cmake/resample/resample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void setup(void) {
2828
// sineWave.begin(config, N_B4);
2929
sineWave.begin(info);
3030
imerge.begin(info);
31-
imerge.add(out);
31+
imerge.add(out, 1);
3232
//Serial.println("started (mixer)...");
3333
}
3434

0 commit comments

Comments
 (0)