History

working webaudio host. random2f arguments are found to be 0 when floats and ints are 64 bit, so turned to 32 bit. not sure what if anything else is broken

Jack Atherton committed 7 years ago

Commit cbbd4451 parent d1956a710 files · +618 −1263Browse files

Showing the changes to src/host_web/chuck_emscripten.cpp (1 of 10 files). Show all

Unified · Split

src/host_web/chuck_emscripten.cpp+39−39
@@ -39,7 +39,7 @@ extern "C" · 38 unmodified lines
39 39
40 40
41 41
42 bool runChuckCodeWithReplacementDac(42 bool EMSCRIPTEN_KEEPALIVE runChuckCodeWithReplacementDac(
43 unsigned int chuckID, const char * code, const char * replacement_dac )43 unsigned int chuckID, const char * code, const char * replacement_dac )
44 {44 {
45 if( chuck_instances.count( chuckID ) == 0 ) { return false; }45 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -60,7 +60,7 @@ extern "C" · 14 unmodified lines
60 60
61 61
62 62
63 bool runChuckFile( unsigned int chuckID,63 bool EMSCRIPTEN_KEEPALIVE runChuckFile( unsigned int chuckID,
64 const char * filename )64 const char * filename )
65 {65 {
66 // run with empty args66 // run with empty args
@@ -69,7 +69,7 @@ extern "C" · 2 unmodified lines
69 69
70 70
71 71
72 bool runChuckFileWithArgs( unsigned int chuckID,72 bool EMSCRIPTEN_KEEPALIVE runChuckFileWithArgs( unsigned int chuckID,
73 const char * filename, const char * args )73 const char * filename, const char * args )
74 {74 {
75 if( chuck_instances.count( chuckID ) == 0 ) { return false; }75 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -86,7 +86,7 @@ extern "C" · 10 unmodified lines
86 86
87 87
88 88
89 bool runChuckFileWithReplacementDac(89 bool EMSCRIPTEN_KEEPALIVE runChuckFileWithReplacementDac(
90 unsigned int chuckID, const char * filename,90 unsigned int chuckID, const char * filename,
91 const char * replacement_dac )91 const char * replacement_dac )
92 {92 {
@@ -98,7 +98,7 @@ extern "C" · 5 unmodified lines
98 98
99 99
100 100
101 bool runChuckFileWithArgsWithReplacementDac(101 bool EMSCRIPTEN_KEEPALIVE runChuckFileWithArgsWithReplacementDac(
102 unsigned int chuckID, const char * filename, const char * args,102 unsigned int chuckID, const char * filename, const char * args,
103 const char * replacement_dac )103 const char * replacement_dac )
104 {104 {
@@ -121,7 +121,7 @@ extern "C" · 16 unmodified lines
121 121
122 122
123 123
124 bool setChuckInt( unsigned int chuckID, const char * name, t_CKINT val )124 bool EMSCRIPTEN_KEEPALIVE setChuckInt( unsigned int chuckID, const char * name, t_CKINT val )
125 {125 {
126 if( chuck_instances.count( chuckID ) == 0 ) { return false; }126 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
127 127
@@ -130,7 +130,7 @@ extern "C" · 2 unmodified lines
130 130
131 131
132 132
133 bool getChuckInt( unsigned int chuckID, const char * name, void (* callback)(t_CKINT) )133 bool EMSCRIPTEN_KEEPALIVE getChuckInt( unsigned int chuckID, const char * name, void (* callback)(t_CKINT) )
134 {134 {
135 if( chuck_instances.count( chuckID ) == 0 ) { return false; }135 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
136 136
@@ -139,7 +139,7 @@ extern "C" · 2 unmodified lines
139 139
140 140
141 141
142 bool setChuckFloat( unsigned int chuckID, const char * name, t_CKFLOAT val )142 bool EMSCRIPTEN_KEEPALIVE setChuckFloat( unsigned int chuckID, const char * name, t_CKFLOAT val )
143 {143 {
144 if( chuck_instances.count( chuckID ) == 0 ) { return false; }144 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
145 145
@@ -148,7 +148,7 @@ extern "C" · 2 unmodified lines
148 148
149 149
150 150
151 bool getChuckFloat( unsigned int chuckID, const char * name, void (* callback)(t_CKFLOAT) )151 bool EMSCRIPTEN_KEEPALIVE getChuckFloat( unsigned int chuckID, const char * name, void (* callback)(t_CKFLOAT) )
152 {152 {
153 if( chuck_instances.count( chuckID ) == 0 ) { return false; }153 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
154 154
@@ -157,7 +157,7 @@ extern "C" · 2 unmodified lines
157 157
158 158
159 159
160 bool setChuckString( unsigned int chuckID, const char * name, const char * val )160 bool EMSCRIPTEN_KEEPALIVE setChuckString( unsigned int chuckID, const char * name, const char * val )
161 {161 {
162 if( chuck_instances.count( chuckID ) == 0 ) { return false; }162 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
163 163
@@ -166,7 +166,7 @@ extern "C" · 2 unmodified lines
166 166
167 167
168 168
169 bool getChuckString( unsigned int chuckID, const char * name, void (* callback)(const char *) )169 bool EMSCRIPTEN_KEEPALIVE getChuckString( unsigned int chuckID, const char * name, void (* callback)(const char *) )
170 {170 {
171 if( chuck_instances.count( chuckID ) == 0 ) { return false; }171 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
172 172
@@ -175,7 +175,7 @@ extern "C" · 2 unmodified lines
175 175
176 176
177 177
178 bool signalChuckEvent( unsigned int chuckID, const char * name )178 bool EMSCRIPTEN_KEEPALIVE signalChuckEvent( unsigned int chuckID, const char * name )
179 {179 {
180 if( chuck_instances.count( chuckID ) == 0 ) { return false; }180 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
181 181
@@ -184,7 +184,7 @@ extern "C" · 2 unmodified lines
184 184
185 185
186 186
187 bool broadcastChuckEvent( unsigned int chuckID, const char * name )187 bool EMSCRIPTEN_KEEPALIVE broadcastChuckEvent( unsigned int chuckID, const char * name )
188 {188 {
189 if( chuck_instances.count( chuckID ) == 0 ) { return false; }189 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
190 190
@@ -193,7 +193,7 @@ extern "C" · 2 unmodified lines
193 193
194 194
195 195
196 bool listenForChuckEventOnce( unsigned int chuckID, const char * name, void (* callback)(void) )196 bool EMSCRIPTEN_KEEPALIVE listenForChuckEventOnce( unsigned int chuckID, const char * name, void (* callback)(void) )
197 {197 {
198 if( chuck_instances.count( chuckID ) == 0 ) { return false; }198 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
199 199
@@ -203,7 +203,7 @@ extern "C" · 3 unmodified lines
203 203
204 204
205 205
206 bool startListeningForChuckEvent( unsigned int chuckID, const char * name, void (* callback)(void) )206 bool EMSCRIPTEN_KEEPALIVE startListeningForChuckEvent( unsigned int chuckID, const char * name, void (* callback)(void) )
207 {207 {
208 if( chuck_instances.count( chuckID ) == 0 ) { return false; }208 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
209 209
@@ -213,7 +213,7 @@ extern "C" · 3 unmodified lines
213 213
214 214
215 215
216 bool stopListeningForChuckEvent( unsigned int chuckID, const char * name, void (* callback)(void) )216 bool EMSCRIPTEN_KEEPALIVE stopListeningForChuckEvent( unsigned int chuckID, const char * name, void (* callback)(void) )
217 {217 {
218 if( chuck_instances.count( chuckID ) == 0 ) { return false; }218 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
219 219
@@ -222,7 +222,7 @@ extern "C" · 2 unmodified lines
222 }222 }
223 223
224 224
225 bool getGlobalUGenSamples( unsigned int chuckID,225 bool EMSCRIPTEN_KEEPALIVE getGlobalUGenSamples( unsigned int chuckID,
226 const char * name, SAMPLE * buffer, int numSamples )226 const char * name, SAMPLE * buffer, int numSamples )
227 {227 {
228 if( chuck_instances.count( chuckID ) == 0 ) { return false; }228 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -241,7 +241,7 @@ extern "C" · 12 unmodified lines
241 241
242 242
243 // int array methods243 // int array methods
244 bool setGlobalIntArray( unsigned int chuckID,244 bool EMSCRIPTEN_KEEPALIVE setGlobalIntArray( unsigned int chuckID,
245 const char * name, t_CKINT arrayValues[], unsigned int numValues )245 const char * name, t_CKINT arrayValues[], unsigned int numValues )
246 {246 {
247 if( chuck_instances.count( chuckID ) == 0 ) { return false; }247 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -252,7 +252,7 @@ extern "C" · 4 unmodified lines
252 252
253 253
254 254
255 bool getGlobalIntArray( unsigned int chuckID,255 bool EMSCRIPTEN_KEEPALIVE getGlobalIntArray( unsigned int chuckID,
256 const char * name, void (* callback)(t_CKINT[], t_CKUINT))256 const char * name, void (* callback)(t_CKINT[], t_CKUINT))
257 {257 {
258 if( chuck_instances.count( chuckID ) == 0 ) { return false; }258 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -263,7 +263,7 @@ extern "C" · 4 unmodified lines
263 263
264 264
265 265
266 bool setGlobalIntArrayValue( unsigned int chuckID,266 bool EMSCRIPTEN_KEEPALIVE setGlobalIntArrayValue( unsigned int chuckID,
267 const char * name, unsigned int index, t_CKINT value )267 const char * name, unsigned int index, t_CKINT value )
268 {268 {
269 if( chuck_instances.count( chuckID ) == 0 ) { return false; }269 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -274,7 +274,7 @@ extern "C" · 4 unmodified lines
274 274
275 275
276 276
277 bool getGlobalIntArrayValue( unsigned int chuckID,277 bool EMSCRIPTEN_KEEPALIVE getGlobalIntArrayValue( unsigned int chuckID,
278 const char * name, unsigned int index, void (* callback)(t_CKINT) )278 const char * name, unsigned int index, void (* callback)(t_CKINT) )
279 {279 {
280 if( chuck_instances.count( chuckID ) == 0 ) { return false; }280 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -285,7 +285,7 @@ extern "C" · 4 unmodified lines
285 285
286 286
287 287
288 bool setGlobalAssociativeIntArrayValue(288 bool EMSCRIPTEN_KEEPALIVE setGlobalAssociativeIntArrayValue(
289 unsigned int chuckID, const char * name, char * key, t_CKINT value )289 unsigned int chuckID, const char * name, char * key, t_CKINT value )
290 {290 {
291 if( chuck_instances.count( chuckID ) == 0 ) { return false; }291 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -296,7 +296,7 @@ extern "C" · 4 unmodified lines
296 296
297 297
298 298
299 bool getGlobalAssociativeIntArrayValue(299 bool EMSCRIPTEN_KEEPALIVE getGlobalAssociativeIntArrayValue(
300 unsigned int chuckID, const char * name, char * key,300 unsigned int chuckID, const char * name, char * key,
301 void (* callback)(t_CKINT) )301 void (* callback)(t_CKINT) )
302 {302 {
@@ -309,7 +309,7 @@ extern "C" · 6 unmodified lines
309 309
310 310
311 // float array methods311 // float array methods
312 bool setGlobalFloatArray( unsigned int chuckID,312 bool EMSCRIPTEN_KEEPALIVE setGlobalFloatArray( unsigned int chuckID,
313 const char * name, t_CKFLOAT arrayValues[], unsigned int numValues )313 const char * name, t_CKFLOAT arrayValues[], unsigned int numValues )
314 {314 {
315 if( chuck_instances.count( chuckID ) == 0 ) { return false; }315 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -320,7 +320,7 @@ extern "C" · 4 unmodified lines
320 320
321 321
322 322
323 bool getGlobalFloatArray( unsigned int chuckID,323 bool EMSCRIPTEN_KEEPALIVE getGlobalFloatArray( unsigned int chuckID,
324 const char * name, void (* callback)(t_CKFLOAT[], t_CKUINT))324 const char * name, void (* callback)(t_CKFLOAT[], t_CKUINT))
325 {325 {
326 if( chuck_instances.count( chuckID ) == 0 ) { return false; }326 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -331,7 +331,7 @@ extern "C" · 4 unmodified lines
331 331
332 332
333 333
334 bool setGlobalFloatArrayValue( unsigned int chuckID,334 bool EMSCRIPTEN_KEEPALIVE setGlobalFloatArrayValue( unsigned int chuckID,
335 const char * name, unsigned int index, t_CKFLOAT value )335 const char * name, unsigned int index, t_CKFLOAT value )
336 {336 {
337 if( chuck_instances.count( chuckID ) == 0 ) { return false; }337 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -342,7 +342,7 @@ extern "C" · 4 unmodified lines
342 342
343 343
344 344
345 bool getGlobalFloatArrayValue( unsigned int chuckID,345 bool EMSCRIPTEN_KEEPALIVE getGlobalFloatArrayValue( unsigned int chuckID,
346 const char * name, unsigned int index, void (* callback)(t_CKFLOAT) )346 const char * name, unsigned int index, void (* callback)(t_CKFLOAT) )
347 {347 {
348 if( chuck_instances.count( chuckID ) == 0 ) { return false; }348 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -353,7 +353,7 @@ extern "C" · 4 unmodified lines
353 353
354 354
355 355
356 bool setGlobalAssociativeFloatArrayValue(356 bool EMSCRIPTEN_KEEPALIVE setGlobalAssociativeFloatArrayValue(
357 unsigned int chuckID, const char * name, char * key, t_CKFLOAT value )357 unsigned int chuckID, const char * name, char * key, t_CKFLOAT value )
358 {358 {
359 if( chuck_instances.count( chuckID ) == 0 ) { return false; }359 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -364,7 +364,7 @@ extern "C" · 4 unmodified lines
364 364
365 365
366 366
367 bool getGlobalAssociativeFloatArrayValue(367 bool EMSCRIPTEN_KEEPALIVE getGlobalAssociativeFloatArrayValue(
368 unsigned int chuckID, const char * name, char * key,368 unsigned int chuckID, const char * name, char * key,
369 void (* callback)(t_CKFLOAT) )369 void (* callback)(t_CKFLOAT) )
370 {370 {
@@ -376,35 +376,35 @@ extern "C" · 5 unmodified lines
376 376
377 377
378 378
379 bool setChoutCallback( unsigned int chuckID, void (* callback)(const char *) )379 bool EMSCRIPTEN_KEEPALIVE setChoutCallback( unsigned int chuckID, void (* callback)(const char *) )
380 {380 {
381 return chuck_instances[chuckID]->setChoutCallback( callback );381 return chuck_instances[chuckID]->setChoutCallback( callback );
382 }382 }
383 383
384 384
385 385
386 bool setCherrCallback( unsigned int chuckID, void (* callback)(const char *) )386 bool EMSCRIPTEN_KEEPALIVE setCherrCallback( unsigned int chuckID, void (* callback)(const char *) )
387 {387 {
388 return chuck_instances[chuckID]->setCherrCallback( callback );388 return chuck_instances[chuckID]->setCherrCallback( callback );
389 }389 }
390 390
391 391
392 392
393 bool setStdoutCallback( void (* callback)(const char *) )393 bool EMSCRIPTEN_KEEPALIVE setStdoutCallback( void (* callback)(const char *) )
394 {394 {
395 return ChucK::setStdoutCallback( callback );395 return ChucK::setStdoutCallback( callback );
396 }396 }
397 397
398 398
399 399
400 bool setStderrCallback( void (* callback)(const char *) )400 bool EMSCRIPTEN_KEEPALIVE setStderrCallback( void (* callback)(const char *) )
401 {401 {
402 return ChucK::setStderrCallback( callback );402 return ChucK::setStderrCallback( callback );
403 }403 }
404 404
405 405
406 406
407 bool setDataDir( const char * dir )407 bool EMSCRIPTEN_KEEPALIVE setDataDir( const char * dir )
408 {408 {
409 chuck_global_data_dir = std::string( dir );409 chuck_global_data_dir = std::string( dir );
410 return true;410 return true;
@@ -412,7 +412,7 @@ extern "C" · 1 unmodified line
412 412
413 413
414 414
415 bool setLogLevel( unsigned int level )415 bool EMSCRIPTEN_KEEPALIVE setLogLevel( unsigned int level )
416 {416 {
417 EM_setlog( level );417 EM_setlog( level );
418 return true;418 return true;
@@ -454,7 +454,7 @@ extern "C" · 35 unmodified lines
454 454
455 455
456 456
457 bool clearChuckInstance( unsigned int chuckID )457 bool EMSCRIPTEN_KEEPALIVE clearChuckInstance( unsigned int chuckID )
458 {458 {
459 if( chuck_instances.count( chuckID ) > 0 )459 if( chuck_instances.count( chuckID ) > 0 )
460 {460 {
@@ -479,7 +479,7 @@ extern "C" · 18 unmodified lines
479 479
480 480
481 481
482 bool clearGlobals( unsigned int chuckID )482 bool EMSCRIPTEN_KEEPALIVE clearGlobals( unsigned int chuckID )
483 {483 {
484 if( chuck_instances.count( chuckID ) > 0 )484 if( chuck_instances.count( chuckID ) > 0 )
485 {485 {
@@ -503,7 +503,7 @@ extern "C" · 17 unmodified lines
503 }503 }
504 504
505 505
506 bool cleanupChuckInstance( unsigned int chuckID )506 bool EMSCRIPTEN_KEEPALIVE cleanupChuckInstance( unsigned int chuckID )
507 {507 {
508 if( chuck_instances.count( chuckID ) > 0 )508 if( chuck_instances.count( chuckID ) > 0 )
509 {509 {
@@ -544,7 +544,7 @@ extern "C" · 34 unmodified lines
544 544
545 545
546 // on launch, reset all ids (necessary when relaunching a lot in unity editor)546 // on launch, reset all ids (necessary when relaunching a lot in unity editor)
547 void cleanRegisteredChucks() {547 void EMSCRIPTEN_KEEPALIVE cleanRegisteredChucks() {
548 // delete chucks548 // delete chucks
549 for( std::map< unsigned int, ChucK * >::iterator it =549 for( std::map< unsigned int, ChucK * >::iterator it =
550 chuck_instances.begin(); it != chuck_instances.end(); it++ )550 chuck_instances.begin(); it != chuck_instances.end(); it++ )

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