Pd-cvs June 2006

pd-cvs@lists.iem.at

13 participants
225 discussions

externals/zexy/tests/l2s argument.pd, NONE, 1.1 delimiter.pd, NONE, 1.1
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/tests/l2s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/tests/l2s Added Files: argument.pd delimiter.pd Log Message: changed [l2s] argument incompatibly: the argument is now the delimiter (analogous to [s2l]) instead of the default list to be converted. while this is an incompatible change, i noticed that the argument handling was broken anyhow (produced rather random results, even in the help-file!) and since nobody noticed i guess the arguments are not used anyhow.... --- NEW FILE: argument.pd --- #N canvas 349 104 581 409 10; #X obj 74 255 outlet; #X obj 74 7 inlet; #X obj 74 28 b; #X text 169 7 the argument is now the delimiter; #X msg 74 50 list 192 168 7 1; #X obj 74 89 t l l b; #X obj 124 126 l2s; #X obj 74 126 l2s .; #X msg 144 106 symbol .; #X obj 74 155 select s; #X msg 74 181 1; #X msg 133 180 0; #X obj 74 214 t f; #X connect 1 0 2 0; #X connect 2 0 4 0; #X connect 4 0 5 0; #X connect 5 0 7 0; #X connect 5 1 6 0; #X connect 5 2 8 0; #X connect 6 0 9 1; #X connect 7 0 9 0; #X connect 8 0 6 1; #X connect 9 0 10 0; #X connect 9 1 11 0; #X connect 10 0 12 0; #X connect 11 0 12 0; #X connect 12 0 0 0; --- NEW FILE: delimiter.pd --- #N canvas 349 104 581 409 10; #X obj 74 255 outlet; #X obj 74 7 inlet; #X obj 74 28 b; #X msg 74 50 list 192 168 7 1; #X obj 74 130 l2s; #X msg 93 110 symbol .; #X obj 74 155 select s; #X msg 74 181 1; #X msg 133 180 0; #X obj 74 214 t f; #X obj 74 89 t l b b; #X msg 133 135 symbol 192.168.7.1; #X text 21 -14 check whether the generated symbol is what we expect... ; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 10 0; #X connect 4 0 6 0; #X connect 5 0 4 1; #X connect 6 0 7 0; #X connect 6 1 8 0; #X connect 7 0 9 0; #X connect 8 0 9 0; #X connect 9 0 0 0; #X connect 10 0 4 0; #X connect 10 1 5 0; #X connect 10 2 11 0; #X connect 11 0 6 1;

1 0

externals/zexy/tests runtests.txt,1.4,1.5
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/tests Modified Files: runtests.txt Log Message: changed [l2s] argument incompatibly: the argument is now the delimiter (analogous to [s2l]) instead of the default list to be converted. while this is an incompatible change, i noticed that the argument handling was broken anyhow (produced rather random results, even in the help-file!) and since nobody noticed i guess the arguments are not used anyhow.... Index: runtests.txt =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/tests/runtests.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** runtests.txt 20 Jun 2006 08:44:27 -0000 1.4 --- runtests.txt 28 Jun 2006 15:53:01 -0000 1.5 *************** *** 69,72 **** --- 69,74 ---- help-msg/zexy; help-msg/z~; + l2s/argument; + l2s/delimiter; repeat/noargs; s2l/numsymbols;

1 0

externals/zexy/examples list2symbol.pd,1.3,1.4
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/examples Modified Files: list2symbol.pd Log Message: changed [l2s] argument incompatibly: the argument is now the delimiter (analogous to [s2l]) instead of the default list to be converted. while this is an incompatible change, i noticed that the argument handling was broken anyhow (produced rather random results, even in the help-file!) and since nobody noticed i guess the arguments are not used anyhow.... Index: list2symbol.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/examples/list2symbol.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** list2symbol.pd 22 Mar 2005 20:58:18 -0000 1.3 --- list2symbol.pd 28 Jun 2006 15:53:01 -0000 1.4 *************** *** 1,12 **** ! #N canvas 228 508 809 343 10; #X obj 135 48 list2symbol; ! #X text 219 48 convert a list into a symbol; #X obj 457 50 l2s; #X symbolatom 75 286 0 0 0 0 - - -; #X msg 75 97 list this was a list and is now a symbol; #X msg 159 118 anythings work fine too; - #X obj 507 268 l2s my bonnie is over the ocean; #X obj 507 288 print; - #X msg 507 247 bang; #X symbolatom 147 223 10 0 0 0 - - -; #X msg 147 158 symbol --; --- 1,10 ---- ! #N canvas 14 156 817 446 10; #X obj 135 48 list2symbol; ! #X text 228 49 convert a list into a symbol; #X obj 457 50 l2s; #X symbolatom 75 286 0 0 0 0 - - -; #X msg 75 97 list this was a list and is now a symbol; #X msg 159 118 anythings work fine too; #X obj 507 288 print; #X symbolatom 147 223 10 0 0 0 - - -; #X msg 147 158 symbol --; *************** *** 17,26 **** #X obj 75 258 list2symbol; #X text 222 203 even to a zero-length symbol!; ! #X connect 4 0 14 0; ! #X connect 5 0 14 0; ! #X connect 6 0 7 0; ! #X connect 8 0 6 0; ! #X connect 9 0 14 1; ! #X connect 10 0 9 0; ! #X connect 13 0 9 0; ! #X connect 14 0 3 0; --- 15,32 ---- #X obj 75 258 list2symbol; #X text 222 203 even to a zero-length symbol!; ! #X msg 507 247 my bonnie is over the ovean; ! #X obj 507 268 l2s .; ! #X text 537 61 updated for zexy-2.2; ! #X text 554 270 argument: default delimiter; ! #X text 316 326 in prior versions of [list2symbol] \, the default delimiter ! was not settable via arguments \; instead the arguments denoted the ! incoming list. this has changed!!!!; ! #X text 321 302 Attention:; ! #X connect 4 0 12 0; ! #X connect 5 0 12 0; ! #X connect 7 0 12 1; ! #X connect 8 0 7 0; ! #X connect 11 0 7 0; ! #X connect 12 0 3 0; ! #X connect 14 0 15 0; ! #X connect 15 0 6 0;

1 0

externals/zexy/src list2symbol.c,1.8,1.9
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/src Modified Files: list2symbol.c Log Message: changed [l2s] argument incompatibly: the argument is now the delimiter (analogous to [s2l]) instead of the default list to be converted. while this is an incompatible change, i noticed that the argument handling was broken anyhow (produced rather random results, even in the help-file!) and since nobody noticed i guess the arguments are not used anyhow.... Index: list2symbol.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/list2symbol.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** list2symbol.c 5 Apr 2006 11:27:26 -0000 1.8 --- list2symbol.c 28 Jun 2006 15:53:01 -0000 1.9 *************** *** 33,36 **** --- 33,38 ---- t_atom *ap; t_symbol *s,*connector; + t_inlet *x_inlet2; + t_outlet*x_outlet; } t_list2symbol; *************** *** 49,55 **** char connlen=0; char*buffer = (char*)getbytes(MAXPDSTRING*sizeof(char)); ! if(x->connector)connector=x->connector->s_name; ! if(connector)connlen=strlen(connector); ! /* 1st get the length of the symbol */ if(x->s)length+=strlen(x->s->s_name); --- 51,59 ---- char connlen=0; char*buffer = (char*)getbytes(MAXPDSTRING*sizeof(char)); ! if(x->connector){ ! connector=x->connector->s_name; ! connlen=strlen(connector); ! } ! /* 1st get the length of the symbol */ if(x->s)length+=strlen(x->s->s_name); *************** *** 80,87 **** if (x->s){ char *buf = x->s->s_name; ! strcpy(result+len, buf); ! len+=strlen(buf); if(i && connector){ ! strcpy(result+len, connector); len += connlen; } --- 84,92 ---- if (x->s){ char *buf = x->s->s_name; ! int buflen=strlen(buf); ! strncpy(result+len, buf, length-len); ! len+=buflen; if(i && connector){ ! strncpy(result+len, connector, length-len); len += connlen; } *************** *** 91,104 **** while(i--){ if(A_SYMBOL==argv->a_type){ ! strcpy(result+len, argv->a_w.w_symbol->s_name); len+= strlen(argv->a_w.w_symbol->s_name); } else { atom_string(argv, buffer, MAXPDSTRING); ! strcpy(result+len, buffer); len += strlen(buffer); } argv++; if(i && connector){ ! strcpy(result+len, connector); len += connlen; } --- 96,109 ---- while(i--){ if(A_SYMBOL==argv->a_type){ ! strncpy(result+len, argv->a_w.w_symbol->s_name, length-len); len+= strlen(argv->a_w.w_symbol->s_name); } else { atom_string(argv, buffer, MAXPDSTRING); ! strncpy(result+len, buffer, length-len); len += strlen(buffer); } argv++; if(i && connector){ ! strncpy(result+len, connector, length-len); len += connlen; } *************** *** 113,120 **** static void list2symbol_anything(t_list2symbol *x, t_symbol *s, int argc, t_atom *argv) { x->s =s; x->ac=argc; ! x->ap=argv; ! list2symbol_bang(x); } --- 118,136 ---- static void list2symbol_anything(t_list2symbol *x, t_symbol *s, int argc, t_atom *argv) { + if(x->ap){ + freebytes(x->ap, x->ac*sizeof(t_atom)); + x->ap=0; + } + x->s =s; x->ac=argc; ! ! x->ap=(t_atom*)getbytes(x->ac*sizeof(t_atom)); ! if(x->ap){ ! t_atom*ap=x->ap; ! while(argc--){ ! *ap++=*argv++; ! } ! } list2symbol_bang(x); } *************** *** 122,126 **** static void list2symbol_list(t_list2symbol *x, t_symbol *s, int argc, t_atom *argv) { - ZEXY_USEVAR(s); list2symbol_anything(x, 0, argc, argv); } --- 138,141 ---- *************** *** 128,137 **** { t_list2symbol *x = (t_list2symbol *)pd_new(list2symbol_class); - ZEXY_USEVAR(s); ! outlet_new(&x->x_obj, 0); ! inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("symbol"), gensym("")); x->connector = gensym(" "); list2symbol_anything(x, 0, argc, argv); return (x); --- 143,159 ---- { t_list2symbol *x = (t_list2symbol *)pd_new(list2symbol_class); ! x->x_outlet=outlet_new(&x->x_obj, 0); ! x->x_inlet2=inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("symbol"), gensym("")); ! ! #if 0 ! /* old behaviour: the argument list is used as the list-to-be-converted */ x->connector = gensym(" "); list2symbol_anything(x, 0, argc, argv); + #else + /* new behaviour: set the delimiter with the argument */ + list2symbol_connector(x, (argc)?atom_getsymbol(argv):gensym(" ")); + #endif + return (x); *************** *** 140,144 **** static void list2symbol_free(t_list2symbol *x) { ! ZEXY_USEVAR(x); } --- 162,171 ---- static void list2symbol_free(t_list2symbol *x) { ! if(x->ap){ ! freebytes(x->ap, x->ac*sizeof(t_atom)); ! x->ap=0; ! } ! outlet_free(x->x_outlet); ! inlet_free(x->x_inlet2); } *************** *** 147,151 **** { list2symbol_class = class_new(gensym("list2symbol"), (t_newmethod)list2symbol_new, ! (t_method)list2symbol_free, sizeof(t_list2symbol), 0, A_GIMME, 0); class_addcreator((t_newmethod)list2symbol_new, gensym("l2s"), A_GIMME, 0); --- 174,179 ---- { list2symbol_class = class_new(gensym("list2symbol"), (t_newmethod)list2symbol_new, ! (t_method)list2symbol_free, sizeof(t_list2symbol), 0, ! A_GIMME, 0); class_addcreator((t_newmethod)list2symbol_new, gensym("l2s"), A_GIMME, 0);

1 0

externals/zexy/tests/l2s - New directory
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/tests/l2s In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26144/tests/l2s Log Message: Directory /cvsroot/pure-data/externals/zexy/tests/l2s added to the repository

1 0

externals/zexy/src regex.c,1.7,1.8
by IOhannes m zmölnig 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19910/src Modified Files: regex.c Log Message: the default regex is now ".*" which matches anything instead of NO regex Index: regex.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/regex.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** regex.c 20 Jun 2006 13:30:25 -0000 1.7 --- regex.c 28 Jun 2006 15:35:05 -0000 1.8 *************** *** 283,286 **** --- 283,291 ---- x->x_matchnum=NUM_REGMATCHES; if(argc)regex_regex(x, gensym(""), argc, argv); + else{ + t_atom a; + SETSYMBOL(&a, gensym(".*")); + regex_regex(x, 0, 1, &a); + } #else error("[regex] non-functional: compiled without regex-support!");

1 0

pd/src m_sched.c,1.5.4.35.2.16,1.5.4.35.2.17
by Tim Blechmann 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22138/src Modified Files: Tag: devel_0_39 m_sched.c Log Message: fix for idle callbacks replacing tabs with spaces Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.16 retrieving revision 1.5.4.35.2.17 diff -C2 -d -r1.5.4.35.2.16 -r1.5.4.35.2.17 *** m_sched.c 27 Jun 2006 16:31:17 -0000 1.5.4.35.2.16 --- m_sched.c 28 Jun 2006 10:51:16 -0000 1.5.4.35.2.17 *************** *** 372,386 **** static void run_clock_callbacks(double next_sys_time) { ! if (clock_setlist && clock_setlist->c_settime <= next_sys_time) ! { ! do ! { ! t_clock *c = clock_setlist; ! sys_time = c->c_settime; ! clock_unset(c); /* the compiler should easily inline this */ ! outlet_setstacklim(); ! (*c->c_fn)(c->c_owner); ! } ! while (clock_setlist && clock_setlist->c_settime <= next_sys_time); } } --- 372,386 ---- static void run_clock_callbacks(double next_sys_time) { ! if (clock_setlist && clock_setlist->c_settime <= next_sys_time) ! { ! do ! { ! t_clock *c = clock_setlist; ! sys_time = c->c_settime; ! clock_unset(c); /* the compiler should easily inline this */ ! outlet_setstacklim(); ! (*c->c_fn)(c->c_owner); ! } ! while (clock_setlist && clock_setlist->c_settime <= next_sys_time); } } *************** *** 390,402 **** void sched_tick(double next_sys_time) { ! run_clock_callbacks(next_sys_time); ! sys_time = next_sys_time; ! sched_diddsp++; /* rethink: how to get rid of this stupid histogram??? */ dsp_tick(); ! /* rethink: should we really do all this midi messaging in the realtime thread ? */ ! sys_pollmidiqueue(); ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); } --- 390,402 ---- void sched_tick(double next_sys_time) { ! run_clock_callbacks(next_sys_time); ! sys_time = next_sys_time; ! sched_diddsp++; /* rethink: how to get rid of this stupid histogram??? */ dsp_tick(); ! /* rethink: should we really do all this midi messaging in the realtime thread ? */ ! sys_pollmidiqueue(); ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); } *************** *** 421,434 **** sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; ! /* T.Grill - lock mutex */ ! sys_lock(); ! sys_clearhist(); ! /* tb: adapt sleepgrain with advance */ ! sys_update_sleepgrain(); ! sched_set_using_dacs(0); /* tb: dsp is switched off */ sys_initmidiqueue(); --- 421,434 ---- sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; ! /* T.Grill - lock mutex */ ! sys_lock(); ! sys_clearhist(); ! /* tb: adapt sleepgrain with advance */ ! sys_update_sleepgrain(); ! sched_set_using_dacs(0); /* tb: dsp is switched off */ sys_initmidiqueue(); *************** *** 436,527 **** while (!sys_quit) { ! if (!sys_callbackscheduler || !sched_usedacs) ! while (sys_keepsched) ! { ! int didsomething = 0; ! int timeforward; ! waitfortick: ! if (sched_usedacs) ! { ! timeforward = sys_send_dacs(); ! /* if dacs remain "idle" for 1 sec, they're hung up. */ ! if (timeforward != 0) ! idlecount = 0; ! else ! { ! idlecount++; ! if (!(idlecount & 31)) ! { ! static double idletime; ! /* on 32nd idle, start a clock watch; every ! 32 ensuing idles, check it */ ! if (idlecount == 32) ! idletime = sys_getrealtime(); ! else if (sys_getrealtime() - idletime > 1.) ! { ! post("audio I/O stuck... closing audio\n"); ! sys_close_audio(); ! sched_set_using_dacs(0); ! goto waitfortick; ! } ! } ! } ! } ! else ! { ! if (1000. * (sys_getrealtime() - sched_referencerealtime) ! > clock_gettimesince(sched_referencelogicaltime)) ! timeforward = SENDDACS_YES; ! else timeforward = SENDDACS_NO; ! } ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! if (timeforward != SENDDACS_NO) ! { ! sched_tick(sys_time + sys_time_per_dsp_tick); ! } ! if (timeforward == SENDDACS_YES) ! didsomething = 1; ! sys_pollmidiqueue(); ! if (sys_pollgui()) ! { ! didsomething = 1; ! } ! /* test for idle; if so, do graphics updates. */ ! if (!didsomething) ! { ! sched_pollformeters(); ! /* tb: call idle callbacks */ ! if (timeforward != SENDDACS_SLEPT) ! { ! run_idle_callbacks(sys_sleepgrain); ! } ! } ! } ! else /* tb: scheduler for callback-based dsp scheduling */ ! while(sys_keepsched) ! { /* tb: allow the audio callback to run */ sys_unlock(); ! sys_microsleep(sys_sleepgrain); ! sys_lock(); ! sys_pollmidiqueue(); ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! ! if (sys_pollgui()) ! continue; ! ! /* do graphics updates and run idle callbacks */ sched_pollformeters(); ! } ! sys_keepsched = 1; ! } sys_close_audio(); --- 436,527 ---- while (!sys_quit) { ! if (!sys_callbackscheduler || !sched_usedacs) ! while (sys_keepsched) ! { ! int didsomething = 0; ! int timeforward; ! waitfortick: ! if (sched_usedacs) ! { ! timeforward = sys_send_dacs(); ! /* if dacs remain "idle" for 1 sec, they're hung up. */ ! if (timeforward != 0) ! idlecount = 0; ! else ! { ! idlecount++; ! if (!(idlecount & 31)) ! { ! static double idletime; ! /* on 32nd idle, start a clock watch; every ! 32 ensuing idles, check it */ ! if (idlecount == 32) ! idletime = sys_getrealtime(); ! else if (sys_getrealtime() - idletime > 1.) ! { ! post("audio I/O stuck... closing audio\n"); ! sys_close_audio(); ! sched_set_using_dacs(0); ! goto waitfortick; ! } ! } ! } ! } ! else ! { ! if (1000. * (sys_getrealtime() - sched_referencerealtime) ! > clock_gettimesince(sched_referencelogicaltime)) ! timeforward = SENDDACS_YES; ! else timeforward = SENDDACS_NO; ! } ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! if (timeforward != SENDDACS_NO) ! { ! sched_tick(sys_time + sys_time_per_dsp_tick); ! } ! if (timeforward == SENDDACS_YES) ! didsomething = 1; ! sys_pollmidiqueue(); ! if (sys_pollgui()) ! { ! didsomething = 1; ! } ! /* test for idle; if so, do graphics updates. */ ! if (!didsomething) ! { ! sched_pollformeters(); ! /* tb: call idle callbacks */ ! if (timeforward != SENDDACS_SLEPT) ! { ! run_idle_callbacks(sys_sleepgrain); ! } ! } ! } ! else /* tb: scheduler for callback-based dsp scheduling */ ! while(sys_keepsched) ! { /* tb: allow the audio callback to run */ sys_unlock(); ! sys_microsleep(sys_sleepgrain); ! sys_lock(); ! sys_pollmidiqueue(); ! sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! ! if (sys_pollgui()) ! continue; ! ! /* do graphics updates and run idle callbacks */ sched_pollformeters(); ! } ! sys_keepsched = 1; ! } sys_close_audio(); *************** *** 540,550 **** void sys_lock(void) { ! pthread_mutex_lock(&sys_mutex); } void sys_unlock(void) { ! pthread_mutex_unlock(&sys_mutex); ! pthread_cond_signal(&sys_cond); } --- 540,550 ---- void sys_lock(void) { ! pthread_mutex_lock(&sys_mutex); } void sys_unlock(void) { ! pthread_mutex_unlock(&sys_mutex); ! pthread_cond_signal(&sys_cond); } *************** *** 561,570 **** int gettimeofday (struct timeval *tv, void* tz) { ! __int64 now; /* time since 1 Jan 1601 in 100ns */ ! ! GetSystemTimeAsFileTime ((FILETIME*) &now); ! tv->tv_usec = (long) ((now / 10LL) % 1000000LL); ! tv->tv_sec = (long) ((now - 116444736000000000LL) / 10000000LL); ! return (0); } #endif --- 561,570 ---- int gettimeofday (struct timeval *tv, void* tz) { ! __int64 now; /* time since 1 Jan 1601 in 100ns */ ! ! GetSystemTimeAsFileTime ((FILETIME*) &now); ! tv->tv_usec = (long) ((now / 10LL) % 1000000LL); ! tv->tv_sec = (long) ((now - 116444736000000000LL) / 10000000LL); ! return (0); } #endif *************** *** 598,602 **** if (ret) ! post("timeout, %d", ret); return ret; --- 598,602 ---- if (ret) ! post("timeout, %d", ret); return ret; *************** *** 606,639 **** int sys_timedlock(int microsec) { ! struct timespec timeout; ! int ret; ! struct timeval now; ! if (sys_trylock() == 0) ! return 0; ! if (microsec < 1e3) ! microsec = 1e3; ! gettimeofday(&now,0); ! ! timeout.tv_sec = now.tv_sec; ! timeout.tv_nsec = (now.tv_usec + microsec) * 1000; ! ! while (timeout.tv_nsec > 1e9) ! { ! timeout.tv_sec += 1; ! timeout.tv_nsec -= 1e9; ! } ! ! /* in case the lock has been released during the system call, try ! again before waiting for the signal */ ! if (sys_trylock() == 0) ! return 0; ! ! ret = pthread_cond_timedwait(&sys_cond, &sys_mutex, &timeout); ! ! return ret; } #endif --- 606,639 ---- int sys_timedlock(int microsec) { ! struct timespec timeout; ! int ret; ! struct timeval now; ! if (sys_trylock() == 0) ! return 0; ! if (microsec < 1e3) ! microsec = 1e3; ! gettimeofday(&now,0); ! ! timeout.tv_sec = now.tv_sec; ! timeout.tv_nsec = (now.tv_usec + microsec) * 1000; ! ! while (timeout.tv_nsec > 1e9) ! { ! timeout.tv_sec += 1; ! timeout.tv_nsec -= 1e9; ! } ! ! /* in case the lock has been released during the system call, try ! again before waiting for the signal */ ! if (sys_trylock() == 0) ! return 0; ! ! ret = pthread_cond_timedwait(&sys_cond, &sys_mutex, &timeout); ! ! return ret; } #endif *************** *** 658,663 **** void sys_exit(void) { ! sys_keepsched = 0; ! sys_quit = 1; } --- 658,663 ---- void sys_exit(void) { ! sys_keepsched = 0; ! sys_quit = 1; } *************** *** 670,677 **** typedef struct _sched_callback { ! struct _sched_callback* next; /* next callback in ringbuffer / in fifo */ ! t_int (*function) (t_int* argv); ! t_int* argv; ! t_int argc; } t_sched_callback; --- 670,677 ---- typedef struct _sched_callback { ! struct _sched_callback* next; /* next callback in ringbuffer / in fifo */ ! t_int (*function) (t_int* argv); ! t_int* argv; ! t_int argc; } t_sched_callback; *************** *** 679,694 **** void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { ! t_sched_callback* noo = (t_sched_callback*) getbytes ! (sizeof(t_sched_callback)); ! noo->function = callback; ! noo->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); ! noo->argc = argc; ! noo->next = NULL; ! if (callback_fifo == NULL) ! callback_fifo = fifo_init(); ! ! fifo_put(callback_fifo, noo); } --- 679,702 ---- void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { ! t_sched_callback* noo = (t_sched_callback*) getbytes ! (sizeof(t_sched_callback)); ! noo->function = callback; ! if (argv && argc) ! { ! noo->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); ! noo->argc = argc; ! } ! else ! { ! noo->argc = 0; ! noo->argv = NULL; ! } ! noo->next = NULL; ! if (callback_fifo == NULL) ! callback_fifo = fifo_init(); ! ! fifo_put(callback_fifo, noo); } *************** *** 696,701 **** void sys_init_idle_callbacks(void) { ! callback_fifo = fifo_init(); /* tb: initialize fifo for idle callbacks */ ! } static t_sched_callback *ringbuffer_head; --- 704,709 ---- void sys_init_idle_callbacks(void) { ! callback_fifo = fifo_init(); /* tb: initialize fifo for idle callbacks */ ! } static t_sched_callback *ringbuffer_head; *************** *** 703,765 **** void run_all_idle_callbacks(void) { ! t_sched_callback * new_callback; ! /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ! ringbuffer_head = new_callback; ! } ! else ! { ! next = ringbuffer_head; ! while (next->next != 0) ! next = next->next; ! next->next = new_callback; ! } ! } ! if (ringbuffer_head != NULL) ! { ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! do ! { ! int status; ! status = (idle_callback->function)(idle_callback->argv); ! ! switch (status) ! { ! /* callbacks returning 0 will be deleted */ ! case 0: ! next = idle_callback->next; ! freebytes (idle_callback->argv, idle_callback->argc); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! ! idle_callback = next; ! ! /* callbacks returning 1 will be run again */ ! case 1: ! break; ! /* callbacks returning 2 will be run during the next idle callback */ ! case 2: ! last = idle_callback; ! idle_callback = idle_callback->next; ! } } ! while ((idle_callback != NULL)); } } --- 711,774 ---- void run_all_idle_callbacks(void) { ! t_sched_callback * new_callback; ! /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ! ringbuffer_head = new_callback; ! } ! else ! { ! next = ringbuffer_head; ! while (next->next != 0) ! next = next->next; ! next->next = new_callback; ! } ! } ! if (ringbuffer_head != NULL) ! { ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! do ! { ! int status; ! status = (idle_callback->function)(idle_callback->argv); ! ! switch (status) ! { ! /* callbacks returning 0 will be deleted */ ! case 0: ! next = idle_callback->next; ! if (idle_callback->argv) ! freebytes (idle_callback->argv, idle_callback->argc); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! ! idle_callback = next; ! ! /* callbacks returning 1 will be run again */ ! case 1: ! break; ! /* callbacks returning 2 will be run during the next idle callback */ ! case 2: ! last = idle_callback; ! idle_callback = idle_callback->next; ! } } ! while ((idle_callback != NULL)); } } *************** *** 767,848 **** static void run_idle_callbacks(int microsec) { ! t_sched_callback * new_callback; ! double stop; ! sys_unlock(); ! ! stop = sys_getrealtime()*1.e6 + (double)microsec; ! /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ! ringbuffer_head = new_callback; ! } ! else ! { ! next = ringbuffer_head; ! while (next->next != 0) ! next = next->next; ! next->next = new_callback; ! } ! } ! if (ringbuffer_head != NULL) ! { double remain = stop - sys_getrealtime() * 1.e6; ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! do ! { ! int status; ! sys_lock(); ! status = (idle_callback->function)(idle_callback->argv); ! sys_unlock(); ! ! switch (status) ! { ! /* callbacks returning 0 will be deleted */ ! case 0: ! next = idle_callback->next; if (idle_callback->argc) freebytes (idle_callback->argv, idle_callback->argc); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! ! idle_callback = next; ! ! /* callbacks returning 1 will be run again */ ! case 1: ! break; ! /* callbacks returning 2 will be run during the next idle callback */ ! case 2: ! last = idle_callback; ! idle_callback = idle_callback->next; ! } remain = stop-sys_getrealtime()*1.e6; } ! while ((idle_callback != NULL) && (remain > 0)); ! /* sleep for the rest of the time */ ! if(remain > 0) ! sys_microsleep(remain); ! } else ! sys_microsleep(microsec); ! sys_lock(); } /* } tb */ --- 776,857 ---- static void run_idle_callbacks(int microsec) { ! t_sched_callback * new_callback; ! double stop; ! sys_unlock(); ! ! stop = sys_getrealtime()*1.e6 + (double)microsec; ! /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ! ringbuffer_head = new_callback; ! } ! else ! { ! next = ringbuffer_head; ! while (next->next != 0) ! next = next->next; ! next->next = new_callback; ! } ! } ! if (ringbuffer_head != NULL) ! { double remain = stop - sys_getrealtime() * 1.e6; ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! do ! { ! int status; ! sys_lock(); ! status = (idle_callback->function)(idle_callback->argv); ! sys_unlock(); ! ! switch (status) ! { ! /* callbacks returning 0 will be deleted */ ! case 0: ! next = idle_callback->next; if (idle_callback->argc) freebytes (idle_callback->argv, idle_callback->argc); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! ! idle_callback = next; ! ! /* callbacks returning 1 will be run again */ ! case 1: ! break; ! /* callbacks returning 2 will be run during the next idle callback */ ! case 2: ! last = idle_callback; ! idle_callback = idle_callback->next; ! } remain = stop-sys_getrealtime()*1.e6; } ! while ((idle_callback != NULL) && (remain > 0)); ! /* sleep for the rest of the time */ ! if(remain > 0) ! sys_microsleep(remain); ! } else ! sys_microsleep(microsec); ! sys_lock(); } /* } tb */ *************** *** 850,864 **** void sys_setscheduler(int scheduler) { ! sys_keepsched = 0; ! sys_callbackscheduler = scheduler; ! return; } int sys_getscheduler(void) { ! return sys_callbackscheduler; } ! static t_int sys_xrun_notification_callback(t_int * dumy) { t_symbol * pd = gensym("pd"); --- 859,873 ---- void sys_setscheduler(int scheduler) { ! sys_keepsched = 0; ! sys_callbackscheduler = scheduler; ! return; } int sys_getscheduler(void) { ! return sys_callbackscheduler; } ! static t_int sys_xrun_notification_callback(t_int * dummy) { t_symbol * pd = gensym("pd"); *************** *** 877,881 **** ! static t_int sys_lock_timeout_notification_callback(t_int * dumy) { t_symbol * pd = gensym("pd"); --- 886,890 ---- ! static t_int sys_lock_timeout_notification_callback(t_int * dummy) { t_symbol * pd = gensym("pd");

1 0

externals/grill/flext changes.txt,1.97,1.98
by Thomas Grill 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28571 Modified Files: changes.txt Log Message: more robust structure pack setting for Max/MSP @ Windows fix for 64 bit code fixed bug for Max/MSP when there's no signal inlet changes for Mac/Intel Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** changes.txt 29 May 2006 10:19:26 -0000 1.97 --- changes.txt 27 Jun 2006 22:46:00 -0000 1.98 *************** *** 35,38 **** --- 35,39 ---- - attribute generation is now determined exclusively by each object class setup (not library is before) - more robust pack setting for Max/MSP @ Windows + - should work with Mac/Intel (still untested!) 0.5.0:

1 0

externals/grill/flext/source flcontainers.h,1.8,1.9
by Thomas Grill 28 Jun '06

28 Jun '06

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28571/source Modified Files: flcontainers.h Log Message: more robust structure pack setting for Max/MSP @ Windows fix for 64 bit code fixed bug for Max/MSP when there's no signal inlet changes for Mac/Intel Index: flcontainers.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcontainers.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** flcontainers.h 6 Jul 2005 19:48:31 -0000 1.8 --- flcontainers.h 27 Jun 2006 22:46:00 -0000 1.9 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 150,163 **** "movl (%%esi), %%eax \n\t" "testl %%eax, %%eax \n\t" ! "jz 20f \n" ! "10: \t" "movl (%%eax), %%ebx \n\t" "movl %%edx, %%ecx \n\t" "incl %%ecx \n\t" SMPLOCK "cmpxchg8b (%%esi) \n\t" ! "jz 20f \n\t" "testl %%eax, %%eax \n\t" ! "jnz 10b \n" ! "20: \t" "popl %%ecx \n\t" "popl %%ebx \n\t" --- 150,163 ---- "movl (%%esi), %%eax \n\t" "testl %%eax, %%eax \n\t" ! "jz 2f \n" ! "1: \t" "movl (%%eax), %%ebx \n\t" "movl %%edx, %%ecx \n\t" "incl %%ecx \n\t" SMPLOCK "cmpxchg8b (%%esi) \n\t" ! "jz 2f \n\t" "testl %%eax, %%eax \n\t" ! "jnz 1b \n" ! "2: \t" "popl %%ecx \n\t" "popl %%ebx \n\t" *************** *** 222,235 **** "mov (%%rsi), %%rax \n\t" "test %%rax, %%rax \n\t" ! "jz 20f \n" ! "10: \t" "mov (%%rax), %%rbx \n\t" "mov %%rdx, %%rcx \n\t" "inc %%rcx \n\t" SMPLOCK "cmpxchg16b (%%rsi) \n\t" ! "jz 20f \n\t" "test %%rax, %%rax \n\t" ! "jnz 10b \n" ! "20: \t" "pop %%rcx \n\t" "pop %%rbx \n\t" --- 222,235 ---- "mov (%%rsi), %%rax \n\t" "test %%rax, %%rax \n\t" ! "jz 2f \n" ! "1: \t" "mov (%%rax), %%rbx \n\t" "mov %%rdx, %%rcx \n\t" "inc %%rcx \n\t" SMPLOCK "cmpxchg16b (%%rsi) \n\t" ! "jz 2f \n\t" "test %%rax, %%rax \n\t" ! "jnz 1b \n" ! "2: \t" "pop %%rcx \n\t" "pop %%rbx \n\t"

1 0

externals/zexy/src msgfile.c,1.12,1.13
by IOhannes m zmölnig 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30605/src Modified Files: msgfile.c Log Message: added a new writing mode: '$$' which converts occurences of "$$" to "\$", in order to be able to write pd-patches which make use of arguments Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** msgfile.c 8 Jun 2006 10:45:04 -0000 1.12 --- msgfile.c 27 Jun 2006 16:44:42 -0000 1.13 *************** *** 654,657 **** --- 654,659 ---- int mode = x->mode; + int dollarmode = 0; + FILE *f=0; *************** *** 668,671 **** --- 670,674 ---- buf, MAXPDSTRING); + #if 0 if (!strcmp(format->s_name, "cr")) { mode = CR_MODE; *************** *** 676,679 **** --- 679,698 ---- } else if (*format->s_name) error("msgfile_write: unknown flag: %s", format->s_name); + #else + if(gensym("cr")==format) { + mode = CR_MODE; + } else if(gensym("cvs")==format) { + mode = CSV_MODE; + } else if(gensym("pd")==format) { + mode = PD_MODE; + } else if(gensym("$$")==format) { + mode = PD_MODE; + dollarmode=1; + } else if(format&&format->s_name) { + error("msgfile_write: ignoring unknown flag: %s", format->s_name); + } + + + #endif switch (mode) { *************** *** 697,705 **** while(i--) { ! if (*dumtext==' ') *dumtext=separator; ! if ((*dumtext==';') && (dumtext[1]=='\n')) *dumtext = eol; dumtext++; } ! /* open */ sys_bashfilename(filename->s_name, filnam); --- 716,728 ---- while(i--) { ! if (*dumtext==' ') ! *dumtext=separator; ! else if ((*dumtext==';') && (dumtext[1]=='\n')) ! *dumtext = eol; ! else if(dollarmode && (*dumtext=='$') && (dumtext[1]=='$')) ! *dumtext='\\'; dumtext++; } ! /* open */ sys_bashfilename(filename->s_name, filnam); *************** *** 788,791 **** --- 811,815 ---- x->eol=' '; x->separator=','; + return (x); }

1 0

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 June 2006