Showing the changes to TestPlugin/Source (1 of 4 files). Show all
Unified · Split
| @@ -31,15 +31,15 @@ tTriangle tri; · 30 unmodified lines | ||
| 31 | 31 | tNoise noise; |
| 32 | 32 | tButterworth bw; |
| 33 | 33 | |
| 34 | −tWavetable wt; | |
| 35 | −tCompactWavetable cwt; | |
| 36 | −tWaveset ws; | |
| 34 | +tWaveTable wt; | |
| 35 | +tCompactWaveTable cwt; | |
| 36 | +tWaveSynth ws; | |
| 37 | 37 | |
| 38 | 38 | tBuffer samp; |
| 39 | 39 | tMBSampler sampler; |
| 40 | 40 | |
| 41 | 41 | const int numWavetables = 1; |
| 42 | −tWavetable wavetables[numWavetables]; | |
| 42 | +tWaveTable wavetables[numWavetables]; | |
| 43 | 43 | |
| 44 | 44 | float gain; |
| 45 | 45 | float dtime; |
| @@ -63,8 +63,8 @@ void LEAFTest_init (float sampleRate, int blockSize) · 17 unmodified lines | ||
| 63 | 63 | { |
| 64 | 64 | LEAF_init(&leaf, sampleRate, blockSize, memory, MSIZE, &getRandomFloat); |
| 65 | 65 | |
| 66 | −// tWavetable_init(&wt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 67 | −// tCompactWavetable_init(&cwt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 66 | +// tWaveTable_init(&wt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 67 | +// tCompactWaveTable_init(&cwt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 68 | 68 | |
| 69 | 69 | tMBTriangle_init(&btri, &leaf); |
| 70 | 70 | tMBPulse_init(&bpulse, &leaf); |
| @@ -77,15 +77,14 @@ void LEAFTest_init (float sampleRate, int blockSize) · 6 unmodified lines | ||
| 77 | 77 | tPhasor_setFreq(&phasor, 220.f); |
| 78 | 78 | |
| 79 | 79 | float* set[4]; |
| 80 | − set[0] = __leaf_table_sinewave; | |
| 81 | − set[1] = __leaf_table_triangle[0]; | |
| 82 | − set[2] = __leaf_table_squarewave[0]; | |
| 83 | − set[3] = __leaf_table_sawtooth[0]; | |
| 80 | + set[0] = (float*)__leaf_table_sinewave; | |
| 81 | + set[1] = (float*)__leaf_table_triangle[0]; | |
| 82 | + set[2] = (float*)__leaf_table_squarewave[0]; | |
| 83 | + set[3] = (float*)__leaf_table_sawtooth[0]; | |
| 84 | 84 | int sizes[4]; |
| 85 | 85 | for (int i = 0; i < 4; i++) sizes[i] = 2048; |
| 86 | 86 | |
| 87 | − tWaveset_init(&ws, set, 4, sizes, 10000.f, &leaf); | |
| 88 | − tWaveset_setIndexGain(&ws, 0, -1.0f); | |
| 87 | + tWaveSynth_init(&ws, 1, set, sizes, 4, 10000.f, &leaf); | |
| 89 | 88 | |
| 90 | 89 | lastLoadedAudioSize = 0; |
| 91 | 90 | loadedAudio.clear(); |
| @@ -105,7 +104,7 @@ float LEAFTest_tick (float input) · 13 unmodified lines | ||
| 105 | 104 | float out = 0.0f; |
| 106 | 105 | for (int i = 0; i < fmin(loadedAudio.size(), numWavetables); ++i) |
| 107 | 106 | { |
| 108 | − out += tWavetable_tick(&wavetables[i]); | |
| 107 | +// out += tWaveTable_tick(&wavetables[i]); | |
| 109 | 108 | } |
| 110 | 109 | return out; |
| 111 | 110 | } |
| @@ -118,14 +117,14 @@ void LEAFTest_block (void) · 6 unmodified lines | ||
| 118 | 117 | tMBTriangle_setFreq(&btri, val * 440.f); |
| 119 | 118 | tMBPulse_setFreq(&bpulse, val * 160000.f - 80000.0f); |
| 120 | 119 | tMBSaw_setFreq(&bsaw, val * 10000.f); |
| 121 | −// tWavetable_setFreq(&wt, val * 160000.f - 80000.0f); | |
| 122 | −// tCompactWavetable_setFreq(&cwt, val * 10000.); | |
| 123 | − tWaveset_setFreq(&ws, val * 10000.f); | |
| 120 | +// tWaveTable_setFreq(&wt, val * 160000.f - 80000.0f); | |
| 121 | +// tCompactWaveTable_setFreq(&cwt, val * 10000.); | |
| 122 | + tWaveSynth_setFreq(&ws, 0, val * 10000.f); | |
| 124 | 123 | // tRetune_tuneVoice(&retune, 0, val * 3.0f + 0.5f); |
| 125 | 124 | // tSimpleRetune_tuneVoice(&sretune, 0, 300); |
| 126 | 125 | |
| 127 | 126 | val = getSliderValue("slider2"); |
| 128 | − tWaveset_setIndex(&ws, val); | |
| 127 | + tWaveSynth_setIndex(&ws, val); | |
| 129 | 128 | // tRetune_setPitchFactor(&retune, val * 3.0f + 0.5f, 1); |
| 130 | 129 | |
| 131 | 130 | val = getSliderValue("slider3"); |
| @@ -134,12 +133,12 @@ void LEAFTest_block (void) · 2 unmodified lines | ||
| 134 | 133 | if (lastLoadedAudioSize < loadedAudio.size()) |
| 135 | 134 | { |
| 136 | 135 | int i = (loadedAudio.size() - 1) % numWavetables; |
| 137 | − if (loadedAudio.size() - 1 >= numWavetables) tWavetable_free(&wavetables[i]); | |
| 138 | − tWavetable_init(&wavetables[i], loadedAudio[loadedAudio.size() - 1].getReadPointer(0), loadedAudio[loadedAudio.size() - 1].getNumSamples(), 20000, &leaf); | |
| 136 | + if (loadedAudio.size() - 1 >= numWavetables) tWaveTable_free(&wavetables[i]); | |
| 137 | + tWaveTable_init(&wavetables[i], (float*)loadedAudio[loadedAudio.size() - 1].getReadPointer(0), loadedAudio[loadedAudio.size() - 1].getNumSamples(), 20000, &leaf); | |
| 139 | 138 | |
| 140 | 139 | lastLoadedAudioSize = loadedAudio.size(); |
| 141 | 140 | } |
| 142 | − if (loadedAudio.size() > 0) tWavetable_setFreq(&wavetables[0], 220);//val * 10000.f); | |
| 141 | +// if (loadedAudio.size() > 0) tWaveTable_setFreq(&wavetables[0], 220);//val * 10000.f); | |
| 143 | 142 | } |
| 144 | 143 | |
| 145 | 144 | void LEAFTest_controllerInput (int cnum, float cval) |