Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

doc/pddp TODO,NONE,1.1 all_about_hid_mapping.pd,NONE,1.1
by Hans-Christoph Steiner 20 Nov '04

20 Nov '04

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27962 Added Files: TODO all_about_hid_mapping.pd Log Message: first draft, some basic functionality, no text yet --- NEW FILE: all_about_hid_mapping.pd --- #N canvas 152 109 863 491 10; #N canvas 0 22 450 300 graph1 0; #X array cuberoot 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 426 61 graph; #N canvas 0 22 450 300 graph5 0; #X array exponent 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 741 269 graph; #N canvas 0 22 450 300 graph1 0; #X array cube 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 741 61 graph; #N canvas 0 22 450 300 graph5 0; #X array square 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 741 165 graph; #X obj 54 152 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X floatatom 32 227 5 0 0 0 - - -; #X floatatom 75 226 5 0 0 0 - - -; #X floatatom 120 226 5 0 0 0 - - -; #N canvas 0 22 450 300 graph1 0; #X array logarithmic 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 426 269 graph; #N canvas 0 22 450 300 graph1 0; #X array squareroot 100 float 2; #X coords 0 1 99 0 100 100 1; #X restore 426 165 graph; #X obj 166 253 hid_rel2abs; #X msg 178 224 reset; #X floatatom 170 288 5 0 0 0 - - -; #X obj 75 244 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 119 244 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 32 251 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 96 165 poll 50; #X floatatom 44 343 5 0 0 0 - - -; #X obj 43 281 hid_smooth; #N canvas 27 65 565 545 draw_arrays 0; #X msg 77 62 bang; #X obj 77 83 until; #X text 108 62 start; #X obj 77 105 f; #X obj 106 105 + 1; #X obj 152 107 sel 0; #X obj 106 127 mod 100; #X obj 183 345 tabwrite logarithmic; #X obj 77 170 t f f; #X obj 183 486 tabwrite exponent; #X obj 114 197 s array_index; #X obj 443 267 r array_index; #X obj 183 439 tabwrite square; #X obj 183 300 tabwrite squareroot; #X obj 183 281 hid_squareroot; #X obj 77 197 / 50; #X obj 77 217 - 1; #X text 108 217 [hid] output range: -1 to 1; #X obj 183 420 hid_square; #X obj 183 326 hid_log; #X obj 183 372 hid_cube; #X obj 183 391 tabwrite cube; #X obj 183 236 hid_cuberoot; #X obj 183 255 tabwrite cuberoot; #X obj 183 467 hid_exp; #X obj 77 23 loadbang; #X connect 0 0 1 0; #X connect 1 0 3 0; #X connect 3 0 4 0; #X connect 3 0 8 0; #X connect 4 0 6 0; #X connect 5 0 1 1; #X connect 6 0 3 1; #X connect 6 0 5 0; #X connect 8 0 15 0; #X connect 8 1 10 0; #X connect 11 0 7 1; #X connect 11 0 12 1; #X connect 11 0 13 1; #X connect 11 0 21 1; #X connect 11 0 23 1; #X connect 11 0 9 1; #X connect 14 0 13 0; #X connect 15 0 16 0; #X connect 16 0 14 0; #X connect 16 0 18 0; #X connect 16 0 19 0; #X connect 16 0 20 0; #X connect 16 0 22 0; #X connect 16 0 24 0; #X connect 18 0 12 0; #X connect 19 0 7 0; #X connect 20 0 21 0; #X connect 22 0 23 0; #X connect 24 0 9 0; #X connect 25 0 0 0; #X restore 573 30 pd draw_arrays; #X obj 621 316 hid_exp; #X obj 620 201 hid_square; #X obj 624 104 hid_cube; #X obj 286 101 hid_cuberoot; #X obj 281 315 hid_log; #X obj 281 213 hid_squareroot; #X obj 74 187 mouse 0; #X msg 80 113 open 1; #X msg 90 139 open 2; #X obj 2 2 cnv 15 850 20 empty empty all_about_hid_mapping 20 10 1 18 -233017 -66577 0; #X obj 818 3 pddp; #X obj 125 329 hid_graph; #X floatatom 124 476 5 0 0 0 - - -; #X connect 4 0 26 0; #X connect 5 0 15 0; #X connect 5 0 18 0; #X connect 6 0 13 0; #X connect 7 0 14 0; #X connect 7 0 10 0; #X connect 10 0 12 0; #X connect 11 0 10 0; #X connect 16 0 26 0; #X connect 17 0 31 0; #X connect 18 0 17 0; #X connect 26 0 5 0; #X connect 26 1 6 0; #X connect 26 2 7 0; #X connect 27 0 26 0; #X connect 28 0 26 0; #X connect 31 0 32 0; --- NEW FILE: TODO --- - auto-generate table_of_contents.pd from all all_about_*.pd patches - make a Pd patch to launch table_of_contents.pd to solve recursive problem

1 0

pd/src s_audio_asio.cpp,1.1.4.13,1.1.4.14
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5654/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: better style.... Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.13 retrieving revision 1.1.4.14 diff -C2 -d -r1.1.4.13 -r1.1.4.14 *** s_audio_asio.cpp 18 Nov 2004 22:27:08 -0000 1.1.4.13 --- s_audio_asio.cpp 18 Nov 2004 22:50:44 -0000 1.1.4.14 *************** *** 522,554 **** static void zerovec_nrm(t_sample *dst,int n) { memset(dst,0,n*sizeof(t_sample)); } ! static void (*_copyvec)(t_sample *dst,t_sample *src,int n) = &copyvec_nrm; ! static void (*_zerovec)(t_sample *dst,int n) = &zerovec_nrm; ! static t_int *(*_clipperf)(t_int *w) = &clip_perform; ! ! inline void copyblock(t_sample *dst,t_sample *src) { _copyvec(dst,src,sys_dacblocksize); } ! inline void zeroblock(t_sample *dst) { _zerovec(dst,sys_dacblocksize); } ! inline void clipblock(t_int *w) { _clipperf(w); } ! static void setblockops() { if(SIMD_CHKCNT(sys_dacblocksize)) { // urgh... ugly cast ! _copyvec = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; ! _zerovec = &zerovec_simd; ! _clipperf = &clip_perf_simd; } else { ! _copyvec = &copyvec_nrm; ! _zerovec = &zerovec_nrm; ! _clipperf = &clip_perform; } - } - - /*************************************************************************/ ! /* called on every dac~ send */ ! int asio_send_dacs(void) ! { ! setblockops(); t_sample * sp; /* sample pointer */ --- 522,548 ---- static void zerovec_nrm(t_sample *dst,int n) { memset(dst,0,n*sizeof(t_sample)); } ! /*************************************************************************/ ! /* called on every dac~ send */ ! int asio_send_dacs(void) { + /* set block copy/zero/clip functions */ + void (*copyblock)(t_sample *dst,t_sample *src,int n); + void (*zeroblock)(t_sample *dst,int n); + t_int *(*clipblock)(t_int *w); + if(SIMD_CHKCNT(sys_dacblocksize)) { // urgh... ugly cast ! copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; ! zeroblock = &zerovec_simd; ! clipblock = &clip_perf_simd; } else { ! copyblock = &copyvec_nrm; ! zeroblock = &zerovec_nrm; ! clipblock = &clip_perform; } ! /*************************************/ t_sample * sp; /* sample pointer */ *************** *** 583,587 **** clipblock(clipargs); ! zeroblock(sp); sp+=sys_dacblocksize; } --- 577,581 ---- clipblock(clipargs); ! zeroblock(sp,sys_dacblocksize); sp+=sys_dacblocksize; } *************** *** 606,610 **** #else /* working but higher latency */ ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); #endif sp+=sys_dacblocksize; --- 600,604 ---- #else /* working but higher latency */ ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset,sys_dacblocksize); #endif sp+=sys_dacblocksize;

1 0

pd/src s_audio_asio.cpp,1.1.4.12,1.1.4.13
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31666/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: - adapted for new sys_dacblksize variable - better use more conservative ringbuffer input code Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.12 retrieving revision 1.1.4.13 diff -C2 -d -r1.1.4.12 -r1.1.4.13 *** s_audio_asio.cpp 18 Nov 2004 09:19:48 -0000 1.1.4.12 --- s_audio_asio.cpp 18 Nov 2004 22:27:08 -0000 1.1.4.13 *************** *** 516,535 **** } ! /* for clipping: */ ! extern "C" t_int *clip_perform(t_int *w); ! #if SIMD_CHKCNT(sys_dacblocksize) ! inline void copyblock(t_sample *dst,t_sample *src) { copyvec_simd(dst,src,sys_dacblocksize); } ! inline void zeroblock(t_sample *dst) { zerovec_simd(dst,sys_dacblocksize); } ! inline void clipblock(t_int *w) { clip_perf_simd(w); } ! #else ! inline void copyblock(t_sample *dst,t_sample *src) { memcpy(dst,src,sys_dacblocksize*sizeof(t_sample)); } ! inline void zeroblock(t_sample *dst) { memset(dst,0,sys_dacblocksize*sizeof(t_sample)); } ! inline void clipblock(t_int *w) { clip_perform(w); } ! #endif /* called on every dac~ send */ int asio_send_dacs(void) { t_sample * sp; /* sample pointer */ int i, j; --- 516,555 ---- } ! /**************************************************************************/ ! /* some function pointers for eventual fast copying when SIMD is possible */ ! static void copyvec_nrm(t_sample *dst,t_sample *src,int n) { memcpy(dst,src,n*sizeof(t_sample)); } ! static void zerovec_nrm(t_sample *dst,int n) { memset(dst,0,n*sizeof(t_sample)); } ! ! static void (*_copyvec)(t_sample *dst,t_sample *src,int n) = &copyvec_nrm; ! static void (*_zerovec)(t_sample *dst,int n) = &zerovec_nrm; ! static t_int *(*_clipperf)(t_int *w) = &clip_perform; ! ! inline void copyblock(t_sample *dst,t_sample *src) { _copyvec(dst,src,sys_dacblocksize); } ! inline void zeroblock(t_sample *dst) { _zerovec(dst,sys_dacblocksize); } ! inline void clipblock(t_int *w) { _clipperf(w); } ! ! static void setblockops() ! { ! if(SIMD_CHKCNT(sys_dacblocksize)) { ! // urgh... ugly cast ! _copyvec = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; ! _zerovec = &zerovec_simd; ! _clipperf = &clip_perf_simd; ! } ! else { ! _copyvec = &copyvec_nrm; ! _zerovec = &zerovec_nrm; ! _clipperf = &clip_perform; ! } ! } ! ! /*************************************************************************/ /* called on every dac~ send */ int asio_send_dacs(void) { + setblockops(); + t_sample * sp; /* sample pointer */ int i, j; *************** *** 551,554 **** --- 571,575 ---- { /* clipping here, we are sure, we can use simd instructions */ + /* TG: are we? can sys_dacblocksize be < 16, with onset and size then not SIMD-able? */ t_float lo = -1.f; t_float hi = 1.f; *************** *** 558,562 **** clipargs[3] = (t_int)&lo; clipargs[4] = (t_int)&hi; ! clipargs[5] = (t_int)DEFDACBLKSIZE; clipblock(clipargs); --- 579,583 ---- clipargs[3] = (t_int)&lo; clipargs[4] = (t_int)&hi; ! clipargs[5] = (t_int)sys_dacblocksize; clipblock(clipargs); *************** *** 570,578 **** for (j = 0; j < sys_inchannels; j++) { /* we should be able to read from the ringbuffer on a different position * to reduce latency for asio buffer sizes that aren't multiples of 64... */ ! #if 1 ! int offset = asio_bufsize + DEFDACBLKSIZE; ! offset += DEFDACBLKSIZE - offset % DEFDACBLKSIZE; if (asio_ringbuffer_inoffset < offset) --- 591,599 ---- for (j = 0; j < sys_inchannels; j++) { + #if 0 /* we should be able to read from the ringbuffer on a different position * to reduce latency for asio buffer sizes that aren't multiples of 64... */ ! int offset = asio_bufsize + sys_dacblocksize; ! offset += sys_dacblocksize - offset % sys_dacblocksize; if (asio_ringbuffer_inoffset < offset) *************** *** 583,587 **** else memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset, 64*sizeof(t_sample)); ! #else /* working but higher latency */ copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); #endif --- 604,609 ---- else memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset, 64*sizeof(t_sample)); ! #else ! /* working but higher latency */ copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); #endif *************** *** 1164,1165 **** --- 1186,1188 ---- #endif /* USEAPI_ASIO */ +

1 0

pd/src m_simd_sse_vc.c,1.1.4.3,1.1.4.4
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31249/src Modified Files: Tag: devel_0_38 m_simd_sse_vc.c Log Message: fixed buglet in clip_perform Index: m_simd_sse_vc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_vc.c,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** m_simd_sse_vc.c 14 Nov 2004 12:42:04 -0000 1.1.4.3 --- m_simd_sse_vc.c 18 Nov 2004 22:25:06 -0000 1.1.4.4 *************** *** 854,858 **** shufps xmm1,xmm1,0 ! mov ecx,dword ptr [esi + 4*TYPE t_int] /* n */ shr ecx,4 --- 854,858 ---- shufps xmm1,xmm1,0 ! mov ecx,dword ptr [esi + 5*TYPE t_int] /* n */ shr ecx,4

1 0

pd/src s_audio_asio.cpp,1.1.4.11,1.1.4.12
by Tim Blechmann 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: dithering and (hopefully) reduced latency Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.11 retrieving revision 1.1.4.12 diff -C2 -d -r1.1.4.11 -r1.1.4.12 *** s_audio_asio.cpp 10 Nov 2004 22:37:31 -0000 1.1.4.11 --- s_audio_asio.cpp 18 Nov 2004 09:19:48 -0000 1.1.4.12 *************** *** 3,7 **** * WARRANTIES, see the file, "LICENSE.txt" in this distribution. */ ! /* native ASIO interface for windows and mac osx * adapted from hostsample.cpp (ASIO SDK) */ --- 3,7 ---- * WARRANTIES, see the file, "LICENSE.txt" in this distribution. */ ! /* native ASIO interface for windows * adapted from hostsample.cpp (ASIO SDK) */ *************** *** 397,400 **** --- 397,401 ---- bailout: + if(status) post("error: %s", asio_driver->errorMessage); post("ASIO: couldn't start"); asio_close_audio(); *************** *** 550,555 **** { /* clipping here, we are sure, we can use simd instructions */ ! t_int lo = -1; ! t_int hi = 1; t_int clipargs[6]; clipargs[1] = (t_int)sp; --- 551,556 ---- { /* clipping here, we are sure, we can use simd instructions */ ! t_float lo = -1.f; ! t_float hi = 1.f; t_int clipargs[6]; clipargs[1] = (t_int)sp; *************** *** 560,563 **** --- 561,565 ---- clipblock(clipargs); + zeroblock(sp); sp+=sys_dacblocksize; *************** *** 569,581 **** { /* we should be able to read from the ringbuffer on a different position ! * to reduce latency for asio buffer sizes that aren't multiples of 64... ! * rethink this: */ ! #if 0 ! int offset = 2 * asio_bufsize; ! if (asio_ringbuffer_inoffset <= offset ) ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_length + ! asio_ringbuffer_inoffset - offset); ! else ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset); #else /* working but higher latency */ copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); --- 571,586 ---- { /* we should be able to read from the ringbuffer on a different position ! * to reduce latency for asio buffer sizes that aren't multiples of 64... */ ! #if 1 ! int offset = asio_bufsize + DEFDACBLKSIZE; ! offset += DEFDACBLKSIZE - offset % DEFDACBLKSIZE; ! ! if (asio_ringbuffer_inoffset < offset) ! { ! memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_length + ! asio_ringbuffer_inoffset - offset, 64 *sizeof(t_sample)); ! } ! else ! memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset, 64*sizeof(t_sample)); #else /* working but higher latency */ copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); *************** *** 691,723 **** long i, j; - // todo: store the timeInfo for later use - - /* todo: i'm not sure if we'll have to synchronize with other media ... * probably yes ... */ ! /* sys_reftime = get_sys_reference_time(); */ ! /* perform the processing ! * todo: improve input latency ! */ for (i = 0; i < sys_outchannels + sys_inchannels; i++) { if(asio_converter[i]) ! if (asio_bufferinfo[i].isInput != ASIOTrue) ! { ! asio_converter[i]( ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufferinfo[i].buffers[db_idx], ! asio_bufsize); ! } ! else /* these are the input channels */ ! { ! asio_converter[i]( ! asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufsize); ! } } --- 696,721 ---- long i, j; /* todo: i'm not sure if we'll have to synchronize with other media ... * probably yes ... */ ! /* sys_reftime = get_sys_reference_time(); */ ! /* perform the processing */ for (i = 0; i < sys_outchannels + sys_inchannels; i++) { if(asio_converter[i]) ! if (asio_bufferinfo[i].isInput != ASIOTrue) ! { ! asio_converter[i](asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufferinfo[i].buffers[db_idx], ! asio_bufsize); ! } ! else /* these are the input channels */ ! { ! asio_converter[i](asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufsize); ! } } *************** *** 933,936 **** --- 931,936 ---- } + /* todo: check dithering */ + static void float32tofloat32(void* inbuffer, void* outbuffer, long frames) { *************** *** 969,986 **** while (frames--) { ! // TODO: do some dithering!! ! ! float o = *(in++) * SCALE_INT16; #ifdef __GNUC__ ! __int16 srt = lrintf(o); #else ! __int16 srt; __asm { fld o ! fistp srt } #endif ! *out++ = srt; } } --- 969,984 ---- while (frames--) { ! float o = *(in++) * SCALE_INT16 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ ! __int16 lng = lrintf(o); #else ! __int16 lng; __asm { fld o ! fistp lng } #endif ! *out++ = lng ; } } *************** *** 1000,1004 **** while (frames--) { ! float o = *(in++) * SCALE_INT24; #ifdef __GNUC__ __int32 intg = (__int32)lrintf(o); --- 998,1002 ---- while (frames--) { ! float o = *(in++) * SCALE_INT24 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ __int32 intg = (__int32)lrintf(o); *************** *** 1029,1033 **** while (frames--) { ! float o = (float)*(in++) * SCALE_INT32; #ifdef __GNUC__ *out++ = lrintf(o); --- 1027,1031 ---- while (frames--) { ! float o = (float)*(in++) * SCALE_INT32 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ *out++ = lrintf(o); *************** *** 1058,1063 **** while (frames--) { ! // TODO: do some dithering!! ! float o = (float)*(in++) * SCALE_INT16; #ifdef __GNUC__ __int16 reverse = (__int16)lrintf(o); --- 1056,1060 ---- while (frames--) { ! float o = (float)*(in++) * SCALE_INT16 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ __int16 reverse = (__int16)lrintf(o); *************** *** 1088,1092 **** while (frames--) { ! float o = (float)*(in++) * SCALE_INT24; #ifdef __GNUC__ __int32 reverse = (__int32)lrintf(o); --- 1085,1089 ---- while (frames--) { ! float o = (float)*(in++) * SCALE_INT24 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ __int32 reverse = (__int32)lrintf(o); *************** *** 1127,1131 **** while (frames--) { ! float o = (float)*(in++) * SCALE_INT32; #ifdef __GNUC__ __int32 reverse = (__int32)lrintf(o); --- 1124,1128 ---- while (frames--) { ! float o = (float)*(in++) * SCALE_INT32 + triangulardither() * DITHER_SCALE; #ifdef __GNUC__ __int32 reverse = (__int32)lrintf(o);

1 0

externals/grill/pool/source pool.cpp,1.10,1.11
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14880/source Modified Files: pool.cpp Log Message: enhanced and optimized atom parsing roll back to working version conform to ISO C++ Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pool.cpp 9 Nov 2004 03:33:19 -0000 1.10 --- pool.cpp 18 Nov 2004 03:32:31 -0000 1.11 *************** *** 476,507 **** const C *m = c; // remember position ! // check for word type (s = 0,1,2 ... int,float,symbol) ! I s = 0; ! for(; *c && !isspace(*c); ++c) { ! if(!isdigit(*c)) ! if(!s && (*c == '-' || *c == '+')) {} // minus or plus is ok ! else ! s = (*c != '.' || s == 1)?2:1; ! } ! if(a) { ! switch(s) { ! case 0: // integer ! #if FLEXT_SYS == FLEXT_SYS_MAX ! flext::SetInt(*a,atoi(m)); ! break; ! #endif ! case 1: // float ! flext::SetFloat(*a,(F)atof(m)); ! break; ! default: { // anything else is a symbol ! C t = *c; *c = 0; ! flext::SetString(*a,m); ! *c = t; ! break; ! } ! } ! } return c; } --- 476,504 ---- const C *m = c; // remember position ! // go to next whitespace ! // \todo recognize symbol escapes ! for(; *c && !isspace(*c); ++c) {} ! // save character and set delimiter ! char t = *c; *c = 0; + float fres; + // first try float + if(sscanf(m,"%f",&fres)) { + if(a) { + int ires = (int)fres; // try a cast + if(fres == ires) + flext::SetInt(*a,ires); + else + flext::SetFloat(*a,fres); + } + } + // no, it's a symbol + else { + if(a) flext::SetString(*a,m); + } + + // set back the saved character + *c = t; return c; } *************** *** 509,524 **** static BL ParseAtoms(C *tmp,flext::AtomList &l) { ! I i,cnt; ! C *t = tmp; ! for(cnt = 0; ; ++cnt) { ! t = ReadAtom(t,NULL); ! if(!t) break; ! } ! ! l(cnt); ! if(cnt) { ! for(i = 0,t = tmp; i < cnt; ++i) ! t = ReadAtom(t,&l[i]); ! } return true; } --- 506,517 ---- static BL ParseAtoms(C *tmp,flext::AtomList &l) { ! const int MAXATOMS = 1024; ! int cnt = 0; ! t_atom atoms[MAXATOMS]; ! for(char *t = tmp; *t && cnt < MAXATOMS; ++cnt) { ! t = ReadAtom(t,&atoms[cnt]); ! if(!t) break; ! } ! l(cnt,atoms); return true; }

1 0

externals/grill/pool pool.vcproj,1.15,1.16 readme.txt,1.21,1.22
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14880 Modified Files: pool.vcproj readme.txt Log Message: enhanced and optimized atom parsing roll back to working version conform to ISO C++ Index: pool.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.vcproj,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pool.vcproj 3 Nov 2004 03:31:30 -0000 1.15 --- pool.vcproj 18 Nov 2004 03:32:31 -0000 1.16 *************** *** 88,92 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\max\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" --- 88,92 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\max\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" *************** *** 109,115 **** AdditionalDependencies="pd.lib" OutputFile=".\pd-msvc/d/pool.dll" ! LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc/d/pool.pdb" --- 109,115 ---- AdditionalDependencies="pd.lib" OutputFile=".\pd-msvc/d/pool.dll" ! LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\data\prog\pd\pd-cvs\bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc/d/pool.pdb" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/readme.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** readme.txt 31 Oct 2004 04:59:26 -0000 1.21 --- readme.txt 18 Nov 2004 03:32:31 -0000 1.22 *************** *** 94,97 **** --- 94,98 ---- - added "clri" message to erase elements at index - fixed bad bug: pool::priv was not initialized + - enhanced and optimized atom parsing 0.2.0:

1 0

externals/grill/flext flext.vcproj,1.33,1.34
by Thomas Grill 18 Nov '04

18 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14606 Modified Files: flext.vcproj Log Message: another fix for the attribute editor Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** flext.vcproj 17 Nov 2004 03:30:50 -0000 1.33 --- flext.vcproj 18 Nov 2004 03:31:03 -0000 1.34 *************** *** 172,176 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" StringPooling="TRUE" --- 172,176 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" StringPooling="TRUE"

1 0

externals/grill/flext/source flattr_ed.cpp,1.27,1.28
by Thomas Grill 17 Nov '04

17 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25684/source Modified Files: flattr_ed.cpp Log Message: fix for _long_ attribute dialogs another fix for the attribute editor Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** flattr_ed.cpp 15 Nov 2004 03:30:59 -0000 1.27 --- flattr_ed.cpp 17 Nov 2004 03:30:50 -0000 1.28 *************** *** 531,535 **** th->GetAttrib(sym,gattr,lv); ! char *b = buf; for(int i = 0; i < lv.Count(); ++i) { char tmp[100]; --- 531,535 ---- th->GetAttrib(sym,gattr,lv); ! char *b = buf; *b = 0; for(int i = 0; i < lv.Count(); ++i) { char tmp[100]; *************** *** 549,553 **** const AtomList &lp = initdata?*initdata:lv; ! char *b = buf; for(int i = 0; i < lp.Count(); ++i) { char tmp[256]; --- 549,553 ---- const AtomList &lp = initdata?*initdata:lv; ! char *b = buf; *b = 0; for(int i = 0; i < lp.Count(); ++i) { char tmp[256];

1 0

externals/grill/flext flext.vcproj,1.32,1.33
by Thomas Grill 17 Nov '04

17 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25684 Modified Files: flext.vcproj Log Message: fix for _long_ attribute dialogs another fix for the attribute editor Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** flext.vcproj 2 Nov 2004 04:57:57 -0000 1.32 --- flext.vcproj 17 Nov 2004 03:30:50 -0000 1.33 *************** *** 324,328 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\packs\pthreads,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_SHARED;FLEXT_EXPORTS;FLEXT_PDLOCK" BasicRuntimeChecks="3" --- 324,328 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\packs\pthreads;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_SHARED;FLEXT_EXPORTS;FLEXT_PDLOCK" BasicRuntimeChecks="3" *************** *** 343,347 **** AdditionalDependencies="pd.lib pthreadVC.lib stk_d.lib sndobj.lib" OutputFile=".\pd-msvc\flext_d.dll" ! AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin;f:\prog\packs\pthreads;F:\prog\audio\stk\lib;F:\prog\audio\sndobj\lib" GenerateDebugInformation="TRUE" OptimizeReferences="1" --- 343,347 ---- AdditionalDependencies="pd.lib pthreadVC.lib stk_d.lib sndobj.lib" OutputFile=".\pd-msvc\flext_d.dll" ! AdditionalLibraryDirectories=""c:\data\prog\pd\pd-cvs\bin";c:\data\prog\packs\pthreads;c:\data\prog\audio\stk\lib;c:\data\prog\audio\sndobj\lib" GenerateDebugInformation="TRUE" OptimizeReferences="1" *************** *** 353,357 **** Name="VCPostBuildEventTool" Description="copy flext to vibrez" ! CommandLine="copy F:\pdmax\flext\pd-msvc\flext_d.dll f:\vibrez\debug"/> <Tool Name="VCPreBuildEventTool"/> --- 353,358 ---- Name="VCPostBuildEventTool" Description="copy flext to vibrez" ! CommandLine="copy c:\data\pdmax\flext\pd-msvc\flext_d.dll c:\data\vibrez\debug ! "/> <Tool Name="VCPreBuildEventTool"/> *************** *** 388,392 **** FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\packs\pthreads,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_PD;FLEXT_USE_SIMD;FLEXT_SHARED;FLEXT_EXPORTS;FLEXT_PDLOCK" StringPooling="TRUE" --- 389,393 ---- FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\packs\pthreads;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_PD;FLEXT_USE_SIMD;FLEXT_SHARED;FLEXT_EXPORTS;FLEXT_PDLOCK" StringPooling="TRUE" *************** *** 417,424 **** Name="VCPostBuildEventTool" Description="copy flext to vibrez" ! CommandLine="copy F:\pdmax\flext\source\*.h f:\vibrez\api\include ! copy F:\pdmax\flext\pd-msvc\flext_l.lib f:\vibrez\api\lib ! copy F:\pdmax\flext\pd-msvc\flext.dll f:\vibrez\release ! copy F:\pdmax\flext\pd-msvc\flext.dll f:\prog\dll "/> <Tool --- 418,425 ---- Name="VCPostBuildEventTool" Description="copy flext to vibrez" ! CommandLine="copy c:\data\pdmax\flext\source\*.h c:\data\vibrez\api\include\flext ! copy c:\data\pdmax\flext\pd-msvc\flext_l.lib c:\data\vibrez\api\lib ! copy c:\data\pdmax\flext\pd-msvc\flext.dll c:\data\vibrez\release ! copy c:\data\pdmax\flext\pd-msvc\flext.dll c:\data\prog\dll "/> <Tool

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs November 2004