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
3939
4040
4141
42− bool runChuckCodeWithReplacementDac(
42+ bool EMSCRIPTEN_KEEPALIVE runChuckCodeWithReplacementDac(
4343 unsigned int chuckID, const char * code, const char * replacement_dac )
4444 {
4545 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -60,7 +60,7 @@ extern "C" · 14 unmodified lines
6060
6161
6262
63− bool runChuckFile( unsigned int chuckID,
63+ bool EMSCRIPTEN_KEEPALIVE runChuckFile( unsigned int chuckID,
6464 const char * filename )
6565 {
6666 // run with empty args
@@ -69,7 +69,7 @@ extern "C" · 2 unmodified lines
6969
7070
7171
72− bool runChuckFileWithArgs( unsigned int chuckID,
72+ bool EMSCRIPTEN_KEEPALIVE runChuckFileWithArgs( unsigned int chuckID,
7373 const char * filename, const char * args )
7474 {
7575 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -86,7 +86,7 @@ extern "C" · 10 unmodified lines
8686
8787
8888
89− bool runChuckFileWithReplacementDac(
89+ bool EMSCRIPTEN_KEEPALIVE runChuckFileWithReplacementDac(
9090 unsigned int chuckID, const char * filename,
9191 const char * replacement_dac )
9292 {
@@ -98,7 +98,7 @@ extern "C" · 5 unmodified lines
9898
9999
100100
101− bool runChuckFileWithArgsWithReplacementDac(
101+ bool EMSCRIPTEN_KEEPALIVE runChuckFileWithArgsWithReplacementDac(
102102 unsigned int chuckID, const char * filename, const char * args,
103103 const char * replacement_dac )
104104 {
@@ -121,7 +121,7 @@ extern "C" · 16 unmodified lines
121121
122122
123123
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 )
125125 {
126126 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
127127
@@ -130,7 +130,7 @@ extern "C" · 2 unmodified lines
130130
131131
132132
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) )
134134 {
135135 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
136136
@@ -139,7 +139,7 @@ extern "C" · 2 unmodified lines
139139
140140
141141
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 )
143143 {
144144 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
145145
@@ -148,7 +148,7 @@ extern "C" · 2 unmodified lines
148148
149149
150150
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) )
152152 {
153153 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
154154
@@ -157,7 +157,7 @@ extern "C" · 2 unmodified lines
157157
158158
159159
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 )
161161 {
162162 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
163163
@@ -166,7 +166,7 @@ extern "C" · 2 unmodified lines
166166
167167
168168
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 *) )
170170 {
171171 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
172172
@@ -175,7 +175,7 @@ extern "C" · 2 unmodified lines
175175
176176
177177
178− bool signalChuckEvent( unsigned int chuckID, const char * name )
178+ bool EMSCRIPTEN_KEEPALIVE signalChuckEvent( unsigned int chuckID, const char * name )
179179 {
180180 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
181181
@@ -184,7 +184,7 @@ extern "C" · 2 unmodified lines
184184
185185
186186
187− bool broadcastChuckEvent( unsigned int chuckID, const char * name )
187+ bool EMSCRIPTEN_KEEPALIVE broadcastChuckEvent( unsigned int chuckID, const char * name )
188188 {
189189 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
190190
@@ -193,7 +193,7 @@ extern "C" · 2 unmodified lines
193193
194194
195195
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) )
197197 {
198198 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
199199
@@ -203,7 +203,7 @@ extern "C" · 3 unmodified lines
203203
204204
205205
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) )
207207 {
208208 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
209209
@@ -213,7 +213,7 @@ extern "C" · 3 unmodified lines
213213
214214
215215
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) )
217217 {
218218 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
219219
@@ -222,7 +222,7 @@ extern "C" · 2 unmodified lines
222222 }
223223
224224
225− bool getGlobalUGenSamples( unsigned int chuckID,
225+ bool EMSCRIPTEN_KEEPALIVE getGlobalUGenSamples( unsigned int chuckID,
226226 const char * name, SAMPLE * buffer, int numSamples )
227227 {
228228 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -241,7 +241,7 @@ extern "C" · 12 unmodified lines
241241
242242
243243 // int array methods
244− bool setGlobalIntArray( unsigned int chuckID,
244+ bool EMSCRIPTEN_KEEPALIVE setGlobalIntArray( unsigned int chuckID,
245245 const char * name, t_CKINT arrayValues[], unsigned int numValues )
246246 {
247247 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -252,7 +252,7 @@ extern "C" · 4 unmodified lines
252252
253253
254254
255− bool getGlobalIntArray( unsigned int chuckID,
255+ bool EMSCRIPTEN_KEEPALIVE getGlobalIntArray( unsigned int chuckID,
256256 const char * name, void (* callback)(t_CKINT[], t_CKUINT))
257257 {
258258 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -263,7 +263,7 @@ extern "C" · 4 unmodified lines
263263
264264
265265
266− bool setGlobalIntArrayValue( unsigned int chuckID,
266+ bool EMSCRIPTEN_KEEPALIVE setGlobalIntArrayValue( unsigned int chuckID,
267267 const char * name, unsigned int index, t_CKINT value )
268268 {
269269 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -274,7 +274,7 @@ extern "C" · 4 unmodified lines
274274
275275
276276
277− bool getGlobalIntArrayValue( unsigned int chuckID,
277+ bool EMSCRIPTEN_KEEPALIVE getGlobalIntArrayValue( unsigned int chuckID,
278278 const char * name, unsigned int index, void (* callback)(t_CKINT) )
279279 {
280280 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -285,7 +285,7 @@ extern "C" · 4 unmodified lines
285285
286286
287287
288− bool setGlobalAssociativeIntArrayValue(
288+ bool EMSCRIPTEN_KEEPALIVE setGlobalAssociativeIntArrayValue(
289289 unsigned int chuckID, const char * name, char * key, t_CKINT value )
290290 {
291291 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -296,7 +296,7 @@ extern "C" · 4 unmodified lines
296296
297297
298298
299− bool getGlobalAssociativeIntArrayValue(
299+ bool EMSCRIPTEN_KEEPALIVE getGlobalAssociativeIntArrayValue(
300300 unsigned int chuckID, const char * name, char * key,
301301 void (* callback)(t_CKINT) )
302302 {
@@ -309,7 +309,7 @@ extern "C" · 6 unmodified lines
309309
310310
311311 // float array methods
312− bool setGlobalFloatArray( unsigned int chuckID,
312+ bool EMSCRIPTEN_KEEPALIVE setGlobalFloatArray( unsigned int chuckID,
313313 const char * name, t_CKFLOAT arrayValues[], unsigned int numValues )
314314 {
315315 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -320,7 +320,7 @@ extern "C" · 4 unmodified lines
320320
321321
322322
323− bool getGlobalFloatArray( unsigned int chuckID,
323+ bool EMSCRIPTEN_KEEPALIVE getGlobalFloatArray( unsigned int chuckID,
324324 const char * name, void (* callback)(t_CKFLOAT[], t_CKUINT))
325325 {
326326 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -331,7 +331,7 @@ extern "C" · 4 unmodified lines
331331
332332
333333
334− bool setGlobalFloatArrayValue( unsigned int chuckID,
334+ bool EMSCRIPTEN_KEEPALIVE setGlobalFloatArrayValue( unsigned int chuckID,
335335 const char * name, unsigned int index, t_CKFLOAT value )
336336 {
337337 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -342,7 +342,7 @@ extern "C" · 4 unmodified lines
342342
343343
344344
345− bool getGlobalFloatArrayValue( unsigned int chuckID,
345+ bool EMSCRIPTEN_KEEPALIVE getGlobalFloatArrayValue( unsigned int chuckID,
346346 const char * name, unsigned int index, void (* callback)(t_CKFLOAT) )
347347 {
348348 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -353,7 +353,7 @@ extern "C" · 4 unmodified lines
353353
354354
355355
356− bool setGlobalAssociativeFloatArrayValue(
356+ bool EMSCRIPTEN_KEEPALIVE setGlobalAssociativeFloatArrayValue(
357357 unsigned int chuckID, const char * name, char * key, t_CKFLOAT value )
358358 {
359359 if( chuck_instances.count( chuckID ) == 0 ) { return false; }
@@ -364,7 +364,7 @@ extern "C" · 4 unmodified lines
364364
365365
366366
367− bool getGlobalAssociativeFloatArrayValue(
367+ bool EMSCRIPTEN_KEEPALIVE getGlobalAssociativeFloatArrayValue(
368368 unsigned int chuckID, const char * name, char * key,
369369 void (* callback)(t_CKFLOAT) )
370370 {
@@ -376,35 +376,35 @@ extern "C" · 5 unmodified lines
376376
377377
378378
379− bool setChoutCallback( unsigned int chuckID, void (* callback)(const char *) )
379+ bool EMSCRIPTEN_KEEPALIVE setChoutCallback( unsigned int chuckID, void (* callback)(const char *) )
380380 {
381381 return chuck_instances[chuckID]->setChoutCallback( callback );
382382 }
383383
384384
385385
386− bool setCherrCallback( unsigned int chuckID, void (* callback)(const char *) )
386+ bool EMSCRIPTEN_KEEPALIVE setCherrCallback( unsigned int chuckID, void (* callback)(const char *) )
387387 {
388388 return chuck_instances[chuckID]->setCherrCallback( callback );
389389 }
390390
391391
392392
393− bool setStdoutCallback( void (* callback)(const char *) )
393+ bool EMSCRIPTEN_KEEPALIVE setStdoutCallback( void (* callback)(const char *) )
394394 {
395395 return ChucK::setStdoutCallback( callback );
396396 }
397397
398398
399399
400− bool setStderrCallback( void (* callback)(const char *) )
400+ bool EMSCRIPTEN_KEEPALIVE setStderrCallback( void (* callback)(const char *) )
401401 {
402402 return ChucK::setStderrCallback( callback );
403403 }
404404
405405
406406
407− bool setDataDir( const char * dir )
407+ bool EMSCRIPTEN_KEEPALIVE setDataDir( const char * dir )
408408 {
409409 chuck_global_data_dir = std::string( dir );
410410 return true;
@@ -412,7 +412,7 @@ extern "C" · 1 unmodified line
412412
413413
414414
415− bool setLogLevel( unsigned int level )
415+ bool EMSCRIPTEN_KEEPALIVE setLogLevel( unsigned int level )
416416 {
417417 EM_setlog( level );
418418 return true;
@@ -454,7 +454,7 @@ extern "C" · 35 unmodified lines
454454
455455
456456
457− bool clearChuckInstance( unsigned int chuckID )
457+ bool EMSCRIPTEN_KEEPALIVE clearChuckInstance( unsigned int chuckID )
458458 {
459459 if( chuck_instances.count( chuckID ) > 0 )
460460 {
@@ -479,7 +479,7 @@ extern "C" · 18 unmodified lines
479479
480480
481481
482− bool clearGlobals( unsigned int chuckID )
482+ bool EMSCRIPTEN_KEEPALIVE clearGlobals( unsigned int chuckID )
483483 {
484484 if( chuck_instances.count( chuckID ) > 0 )
485485 {
@@ -503,7 +503,7 @@ extern "C" · 17 unmodified lines
503503 }
504504
505505
506− bool cleanupChuckInstance( unsigned int chuckID )
506+ bool EMSCRIPTEN_KEEPALIVE cleanupChuckInstance( unsigned int chuckID )
507507 {
508508 if( chuck_instances.count( chuckID ) > 0 )
509509 {
@@ -544,7 +544,7 @@ extern "C" · 34 unmodified lines
544544
545545
546546 // on launch, reset all ids (necessary when relaunching a lot in unity editor)
547− void cleanRegisteredChucks() {
547+ void EMSCRIPTEN_KEEPALIVE cleanRegisteredChucks() {
548548 // delete chucks
549549 for( std::map< unsigned int, ChucK * >::iterator it =
550550 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