Showing the changes to TestPlugin/Source/MyTest.cpp (1 of 8 files). Show all
Unified · Split
| @@ -9,7 +9,6 @@ · 8 unmodified lines | ||
| 9 | 9 | #include "LEAFTest.h" |
| 10 | 10 | #include "MyTest.h" |
| 11 | 11 | |
| 12 | − | |
| 13 | 12 | static void leaf_pool_report(void); |
| 14 | 13 | static void leaf_pool_dump(void); |
| 15 | 14 | static void run_pool_test(void); |
| @@ -18,11 +17,6 @@ tMBSaw bsaw; · 2 unmodified lines | ||
| 18 | 17 | tMBTriangle btri; |
| 19 | 18 | tMBPulse bpulse; |
| 20 | 19 | |
| 21 | −tRetune retune; | |
| 22 | −tSimpleRetune sretune; | |
| 23 | − | |
| 24 | −tCompressor compressor; | |
| 25 | − | |
| 26 | 20 | tSVF lp, hp; |
| 27 | 21 | |
| 28 | 22 | tPeriodDetection pd; |
| @@ -32,6 +26,12 @@ tEnvelopeFollower ef; · 3 unmodified lines | ||
| 32 | 26 | |
| 33 | 27 | tTriangle tri; |
| 34 | 28 | |
| 29 | +tNoise noise; | |
| 30 | +tButterworth bw; | |
| 31 | + | |
| 32 | +tWavetable wt; | |
| 33 | +tCompactWavetable cwt; | |
| 34 | + | |
| 35 | 35 | tBuffer samp; |
| 36 | 36 | tMBSampler sampler; |
| 37 | 37 | |
| @@ -55,9 +55,8 @@ void LEAFTest_init (float sampleRate, int blockSize) · 17 unmodified lines | ||
| 55 | 55 | { |
| 56 | 56 | LEAF_init(&leaf, sampleRate, blockSize, memory, MSIZE, &getRandomFloat); |
| 57 | 57 | |
| 58 | − tRetune_init(&retune, 1, mtof(48), mtof(72), 2048, &leaf); | |
| 59 | − tSimpleRetune_init(&sretune, 1, mtof(48), mtof(72), 2048, &leaf); | |
| 60 | − tSimpleRetune_setMode(&sretune, 1); | |
| 58 | + tWavetable_init(&wt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 59 | + tCompactWavetable_init(&cwt, __leaf_table_sawtooth[0], 2048, 10000.f, &leaf); | |
| 61 | 60 | } |
| 62 | 61 | |
| 63 | 62 | inline double getSawFall(double angle) { |
| @@ -72,7 +71,9 @@ inline double getSawFall(double angle) { · 8 unmodified lines | ||
| 72 | 71 | float LEAFTest_tick (float input) |
| 73 | 72 | { |
| 74 | 73 | // return tRetune_tick(&retune, input)[0]; |
| 75 | − return tSimpleRetune_tick(&sretune, input); | |
| 74 | +// return tSimpleRetune_tick(&sretune, input); | |
| 75 | + return tWavetable_tick(&wt); | |
| 76 | + return tCompactWavetable_tick(&cwt); | |
| 76 | 77 | } |
| 77 | 78 | |
| 78 | 79 | int firstFrame = 1; |
| @@ -80,8 +81,10 @@ bool lastState = false, lastPlayState = false; · 1 unmodified line | ||
| 80 | 81 | void LEAFTest_block (void) |
| 81 | 82 | { |
| 82 | 83 | float val = getSliderValue("slider1"); |
| 83 | − tRetune_tuneVoice(&retune, 0, val * 3.0f + 0.5f); | |
| 84 | − tSimpleRetune_tuneVoice(&sretune, 0, 300); | |
| 84 | + tWavetable_setFreq(&wt, val * 40000.); | |
| 85 | + tCompactWavetable_setFreq(&cwt, val * 10000.); | |
| 86 | +// tRetune_tuneVoice(&retune, 0, val * 3.0f + 0.5f); | |
| 87 | +// tSimpleRetune_tuneVoice(&sretune, 0, 300); | |
| 85 | 88 | |
| 86 | 89 | val = getSliderValue("slider2"); |
| 87 | 90 | // tRetune_setPitchFactor(&retune, val * 3.0f + 0.5f, 1); |