History

split Wavetable into WaveTable and WaveOsc; rework Waveset into WaveSynth

Matthew Wang committed 5 years ago

Commit 23656d71 parent 6da3c644 files · +651 −230Browse files

Showing the changes to TestPlugin/Source/MyTest.cpp (1 of 4 files). Show all

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t