History

remove the global leaf instance, a user declared instance of leaf must be passed into objects; update objects accordingly

Matthew Wang committed 6 years ago

Commit 53a6d7a1 parent 179138336 files · +837 −638Browse files

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

Unified · Split

TestPlugin/Source/MyTest.cpp+25−23
@@ -45,37 +45,39 @@ float a, b, c, d; · 44 unmodified lines
45float* bufIn;45float* bufIn;
46float* bufOut;46float* bufOut;
47 47
48LEAF leaf;
49
48#define MSIZE 204800050#define MSIZE 2048000
49char memory[MSIZE];51char memory[MSIZE];
50 52
51void LEAFTest_init (float sampleRate, int blockSize)53void LEAFTest_init (float sampleRate, int blockSize)
52{54{
53 LEAF_init(sampleRate, blockSize, memory, MSIZE, &getRandomFloat);55 LEAF_init(&leaf, sampleRate, blockSize, memory, MSIZE, &getRandomFloat);
54 56
55 tMBSaw_init(&bsaw);57 tMBSaw_init(&bsaw, &leaf);
56 tMBTriangle_init(&btri);58 tMBTriangle_init(&btri, &leaf);
57 tMBPulse_init(&bpulse);59 tMBPulse_init(&bpulse, &leaf);
58 60
59 bufIn = (float*) leaf_alloc(sizeof(float) * 4096);61 bufIn = (float*) leaf_alloc(&leaf, sizeof(float) * 4096);
60 bufOut = (float*) leaf_alloc(sizeof(float) * 4096);62 bufOut = (float*) leaf_alloc(&leaf, sizeof(float) * 4096);
61 63
62 tDualPitchDetector_init(&detector, mtof(48), mtof(84));64 tDualPitchDetector_init(&detector, mtof(48), mtof(84), &leaf);
63 65
64 tCompressor_init(&compressor);66 tCompressor_init(&compressor, &leaf);
65 67
66 tSVF_init(&lp, SVFTypeLowpass, mtof(84) * 2.0f, 1.0f);68 tSVF_init(&lp, SVFTypeLowpass, mtof(84) * 2.0f, 1.0f, &leaf);
67 tSVF_init(&hp, SVFTypeHighpass, mtof(48) * 0.5f, 1.0f);69 tSVF_init(&hp, SVFTypeHighpass, mtof(48) * 0.5f, 1.0f, &leaf);
68 70
69 tPeriodDetection_init(&pd, bufIn, bufOut, 4096, 1024);71 tPeriodDetection_init(&pd, bufIn, bufOut, 4096, 1024, &leaf);
70 72
71 tZeroCrossingCounter_init(&zc, 128);73 tZeroCrossingCounter_init(&zc, 128, &leaf);
72 tEnvelopeFollower_init(&ef, 0.02f, 0.9999f);74 tEnvelopeFollower_init(&ef, 0.02f, 0.9999f, &leaf);
73 75
74 tTriangle_init(&tri);76 tTriangle_init(&tri, &leaf);
75 tTriangle_setFreq(&tri, 100);77 tTriangle_setFreq(&tri, 100);
76 78
77 tBuffer_init(&samp, 5.0f * leaf.sampleRate);79 tBuffer_init(&samp, 5.0f * leaf.sampleRate, &leaf);
78 tMBSampler_init(&sampler, &samp);80 tMBSampler_init(&sampler, &samp, &leaf);
79 81
80 tMBSampler_setMode(&sampler, PlayLoop);82 tMBSampler_setMode(&sampler, PlayLoop);
81 tMBSampler_setEnd(&sampler, samp->bufferLength);83 tMBSampler_setEnd(&sampler, samp->bufferLength);
@@ -191,13 +193,13 @@ void LEAFTest_end (void) · 109 unmodified lines
191 193
192void leaf_pool_report(void)194void leaf_pool_report(void)
193{195{
194 DBG(String(leaf_pool_get_used()) + " of " + String(leaf_pool_get_size()));196 DBG(String(leaf_pool_get_used(&leaf)) + " of " + String(leaf_pool_get_size(&leaf)));
195}197}
196 198
197void leaf_pool_dump(void)199void leaf_pool_dump(void)
198{200{
199 float* buff = (float*)leaf_pool_get_pool();201 float* buff = (float*)leaf_pool_get_pool(&leaf);
200 unsigned long siz = leaf_pool_get_size();202 unsigned long siz = leaf_pool_get_size(&leaf);
201 siz /= sizeof(float);203 siz /= sizeof(float);
202 for (int i = 0; i < siz; i++)204 for (int i = 0; i < siz; i++)
203 {205 {
@@ -212,7 +214,7 @@ static void run_pool_test(void) · 8 unmodified lines
212 DBG("ALLOC BUFFER 1");214 DBG("ALLOC BUFFER 1");
213 int size = 50;215 int size = 50;
214 float* buffer;216 float* buffer;
215 buffer = (float*) leaf_alloc(sizeof(float) * size);217 buffer = (float*) leaf_alloc(&leaf, sizeof(float) * size);
216 218
217 for (int i = 0; i < size; i++)219 for (int i = 0; i < size; i++)
218 {220 {
@@ -225,7 +227,7 @@ static void run_pool_test(void) · 6 unmodified lines
225 DBG("ALLOC BUFFER 2");227 DBG("ALLOC BUFFER 2");
226 size = 25;228 size = 25;
227 229
228 buffer = (float*) leaf_alloc(sizeof(float) * size);230 buffer = (float*) leaf_alloc(&leaf, sizeof(float) * size);
229 231
230 leaf_pool_report();232 leaf_pool_report();
231 233
@@ -233,14 +235,14 @@ static void run_pool_test(void) · 1 unmodified line
233 {235 {
234 buffer[i] = (float)(i*2);236 buffer[i] = (float)(i*2);
235 }237 }
236 leaf_free((char*)buffer);238 leaf_free(&leaf, (char*)buffer);
237 239
238 leaf_pool_report();240 leaf_pool_report();
239 241
240 DBG("ALLOC BUFFER 3");242 DBG("ALLOC BUFFER 3");
241 size = 15;243 size = 15;
242 244
243 buffer = (float*) leaf_alloc(sizeof(float) * size);245 buffer = (float*) leaf_alloc(&leaf, sizeof(float) * size);
244 246
245 for (int i = 0; i < size; i++)247 for (int i = 0; i < size; i++)
246 {248 {

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