Pd-cvs July 2007

pd-cvs@lists.iem.at

20 participants
623 discussions

pd/src/locale english.tcl,1.1.2.34.2.15,1.1.2.34.2.16
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3095 Modified Files: Tag: desiredata english.tcl Log Message: . Index: english.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/locale/Attic/english.tcl,v retrieving revision 1.1.2.34.2.15 retrieving revision 1.1.2.34.2.16 diff -C2 -d -r1.1.2.34.2.15 -r1.1.2.34.2.16 *** english.tcl 15 Jul 2007 13:16:25 -0000 1.1.2.34.2.15 --- english.tcl 20 Jul 2007 00:47:08 -0000 1.1.2.34.2.16 *************** *** 16,19 **** --- 16,20 ---- say save_as "Save As..." say print "Print..." + say abort_server "Abort Server" say quit "Quit"

1 0

pd/src s_path.c, 1.3.4.6.2.8.2.10, 1.3.4.6.2.8.2.11 m_pd.h, 1.4.4.11.2.33.2.58, 1.4.4.11.2.33.2.59
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10523 Modified Files: Tag: desiredata s_path.c m_pd.h Log Message: added open_via_path2 Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.58 retrieving revision 1.4.4.11.2.33.2.59 diff -C2 -d -r1.4.4.11.2.33.2.58 -r1.4.4.11.2.33.2.59 *** m_pd.h 19 Jul 2007 22:27:39 -0000 1.4.4.11.2.33.2.58 --- m_pd.h 19 Jul 2007 23:41:27 -0000 1.4.4.11.2.33.2.59 *************** *** 569,572 **** --- 569,574 ---- EXTERN int open_via_path(const char *name, const char *ext, const char *dir, char *dirresult, char **nameresult, unsigned int size, int bin); + EXTERN int open_via_path2(const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin); + EXTERN int sched_geteventno(void); EXTERN double sys_getrealtime(void); Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.6.2.8.2.10 retrieving revision 1.3.4.6.2.8.2.11 diff -C2 -d -r1.3.4.6.2.8.2.10 -r1.3.4.6.2.8.2.11 *** s_path.c 19 Jul 2007 21:08:46 -0000 1.3.4.6.2.8.2.10 --- s_path.c 19 Jul 2007 23:41:27 -0000 1.3.4.6.2.8.2.11 *************** *** 194,201 **** canvas-specific path. */ ! static int do_open_via_path(const char *dir, const char *name, ! const char *ext, char **dirresult, char **nameresult, int bin, t_namelist *searchpath) ! { ! t_namelist *nl; int fd = -1; /* first check if "name" is absolute (and if so, try to open) */ --- 194,199 ---- canvas-specific path. */ ! static int do_open_via_path( ! const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin, t_namelist *searchpath) { int fd = -1; /* first check if "name" is absolute (and if so, try to open) */ *************** *** 204,208 **** if ((fd = sys_trytoopenone(dir, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next go through the search path */ ! for (nl = searchpath; nl; nl = nl->nl_next) if ((fd = sys_trytoopenone(nl->nl_string, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next look in "extra" */ --- 202,206 ---- if ((fd = sys_trytoopenone(dir, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next go through the search path */ ! for (t_namelist *nl=searchpath; nl; nl=nl->nl_next) if ((fd = sys_trytoopenone(nl->nl_string, name, ext, dirresult, nameresult, bin)) >= 0) return fd; /* next look in "extra" */ *************** *** 214,217 **** --- 212,219 ---- } + extern "C" int open_via_path2(const char *dir, const char *name, const char *ext, char **dirresult, char **nameresult, int bin) { + return do_open_via_path(dir, name, ext, dirresult, nameresult, bin, sys_searchpath); + } + /* open via path, using the global search path. */ extern "C" int open_via_path(const char *dir, const char *name, const char *ext, *************** *** 227,231 **** extern "C" void open_via_helppath(const char *name, const char *dir) { char realname[MAXPDSTRING], *dirbuf, *basename; - /* make up a silly "dir" if none is supplied */ int fd; /* 1. "objectname-help.pd" */ --- 229,232 ---- *************** *** 248,254 **** } - /* Startup file reading for linux and MACOSX. As of 0.38 this will be - deprecated in favor of the "settings" mechanism */ - extern "C" int sys_argparse(int argc, char **argv); --- 249,252 ----

1 0

pd/src kernel.c,1.1.2.66,1.1.2.67
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3466 Modified Files: Tag: desiredata kernel.c Log Message: removed some MAXPDSTRING Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.66 retrieving revision 1.1.2.67 diff -C2 -d -r1.1.2.66 -r1.1.2.67 *** kernel.c 19 Jul 2007 17:54:50 -0000 1.1.2.66 --- kernel.c 19 Jul 2007 23:22:17 -0000 1.1.2.67 *************** *** 1800,1809 **** t_atom *ap = z->v; for (size_t i=0; i < z->n; i++, ap++) { - char tbuf[MAXPDSTRING]; switch (ap->a_type) { case A_FLOAT: break; case A_SEMI: SETSYMBOL(ap, gensym(";")); break; case A_COMMA: SETSYMBOL(ap, gensym(",")); break; ! case A_DOLLAR: sprintf(tbuf, "$%ld", ap->a_index); SETSYMBOL(ap, gensym(tbuf)); break; case A_DOLLSYM: { ostringstream b; --- 1800,1808 ---- t_atom *ap = z->v; for (size_t i=0; i < z->n; i++, ap++) { switch (ap->a_type) { case A_FLOAT: break; case A_SEMI: SETSYMBOL(ap, gensym(";")); break; case A_COMMA: SETSYMBOL(ap, gensym(",")); break; ! case A_DOLLAR: SETSYMBOL(ap, symprintf("$%ld", ap->a_index)); break; case A_DOLLSYM: { ostringstream b; *************** *** 1927,1931 **** ostringstream buf2; char *str=s->name; - int next=0; t_atom dollarnull; SETFLOAT(&dollarnull, canvas_getdollarzero()); --- 1926,1929 ---- *************** *** 1934,1943 **** * and make everything a A_DOLLSYM that contains(!) a $ whenever this happened, enable this code */ char *substr=strchr(str, '$'); ! if(!substr || substr-str >= MAXPDSTRING) return s; oprintf(buf2,"%.*s",substr-str,str); str=substr+1; for (;;) { std::ostringstream buf; ! next=binbuf_expanddollsym(str, buf, dollarnull, ac, av, tonew); if (next<0) break; /* JMZ: i am not sure what this means, so i might have broken it. it seems like that if "tonew" is --- 1932,1941 ---- * and make everything a A_DOLLSYM that contains(!) a $ whenever this happened, enable this code */ char *substr=strchr(str, '$'); ! if(!substr) return s; oprintf(buf2,"%.*s",substr-str,str); str=substr+1; for (;;) { std::ostringstream buf; ! int next = binbuf_expanddollsym(str, buf, dollarnull, ac, av, tonew); if (next<0) break; /* JMZ: i am not sure what this means, so i might have broken it. it seems like that if "tonew" is *************** *** 2098,2109 **** long length; char *buf; ! char namebuf[MAXPDSTRING]; ! if (*dirname) sprintf(namebuf,"%s/%s",dirname,filename); ! else sprintf(namebuf, "%s", filename); int fd = binbuf_doopen(namebuf, 0); if (fd < 0) {error("open: %s: %s",namebuf,strerror(errno)); return 1;} if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 || !(buf = (char *)malloc(length))) { error("lseek: %s: %s",namebuf,strerror(errno)); ! close(fd); return 1; } --- 2096,2107 ---- long length; char *buf; ! char *namebuf=0; ! if (*dirname) asprintf(&namebuf,"%s/%s",dirname,filename); ! else asprintf(&namebuf, "%s", filename); int fd = binbuf_doopen(namebuf, 0); if (fd < 0) {error("open: %s: %s",namebuf,strerror(errno)); return 1;} if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 || !(buf = (char *)malloc(length))) { error("lseek: %s: %s",namebuf,strerror(errno)); ! close(fd); free(namebuf); return 1; } *************** *** 2111,2122 **** if (readret < length) { error("read (%d %ld) -> %d; %s: %s\n", fd, length, readret, namebuf, strerror(errno)); ! close(fd); ! free(buf); return 1; } if (flags&1) for (int i=0; i<length; i++) if (buf[i]=='\n') buf[i] = ';'; if (flags&2) pd_eval_text(buf,length); else binbuf_text(b, buf, length); ! free(buf); ! close(fd); return 0; } --- 2109,2118 ---- if (readret < length) { error("read (%d %ld) -> %d; %s: %s\n", fd, length, readret, namebuf, strerror(errno)); ! close(fd); free(namebuf); free(buf); return 1; } if (flags&1) for (int i=0; i<length; i++) if (buf[i]=='\n') buf[i] = ';'; if (flags&2) pd_eval_text(buf,length); else binbuf_text(b, buf, length); ! close(fd); free(namebuf); free(buf); return 0; } *************** *** 2125,2132 **** int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int flags) { char *buf, *bufptr; ! int filedesc = canvas_open2(canvas, filename, "", &buf, &bufptr, 0); ! if (filedesc<0) {error("%s: can't open", filename); return 1;} ! close(filedesc); ! free(buf); return !!binbuf_read(b, bufptr, buf, flags); } --- 2121,2127 ---- int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int flags) { char *buf, *bufptr; ! int fd = canvas_open2(canvas, filename, "", &buf, &bufptr, 0); ! if (fd<0) {error("%s: can't open", filename); return 1;} ! close(fd); free(buf); return !!binbuf_read(b, bufptr, buf, flags); } *************** *** 2135,2141 **** int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int flags) { char buf[MAXPDSTRING], *bufptr; ! int filedesc = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0); ! if (filedesc<0) {error("%s: can't open", filename); return 1;} ! close(filedesc); return !!binbuf_read(b, bufptr, buf, flags); } --- 2130,2136 ---- int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int flags) { char buf[MAXPDSTRING], *bufptr; ! int fd = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0); ! if (fd<0) {error("%s: can't open", filename); return 1;} ! close(fd); return !!binbuf_read(b, bufptr, buf, flags); }

1 0

pd/src s_loader.c,1.4.4.5.2.10.2.8,1.4.4.5.2.10.2.9
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26559 Modified Files: Tag: desiredata s_loader.c Log Message: removed some MAXPDSTRING Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.4.4.5.2.10.2.8 retrieving revision 1.4.4.5.2.10.2.9 diff -C2 -d -r1.4.4.5.2.10.2.8 -r1.4.4.5.2.10.2.9 *** s_loader.c 19 Jul 2007 21:08:45 -0000 1.4.4.5.2.10.2.8 --- s_loader.c 19 Jul 2007 22:59:07 -0000 1.4.4.5.2.10.2.9 *************** *** 104,108 **** static int sys_do_load_lib(t_canvas *canvas, char *objectname) { ! char filename[MAXPDSTRING], *dirbuf, *classname, *nameptr; t_xxx makeout = NULL; int fd; --- 104,108 ---- static int sys_do_load_lib(t_canvas *canvas, char *objectname) { ! char *filename=0, *dirbuf, *classname, *nameptr; t_xxx makeout = NULL; int fd; *************** *** 119,127 **** if ((fd = canvas_open2(canvas, objectname, sys_dllextent2, &dirbuf, &nameptr, 1)) >= 0) goto gotone; /* next try (objectname)/(classname).(sys_dllextent) ... */ ! strncpy(filename, objectname, MAXPDSTRING); ! filename[MAXPDSTRING-2] = 0; ! strcat(filename, "/"); ! strncat(filename, classname, MAXPDSTRING-strlen(filename)); ! filename[MAXPDSTRING-1] = 0; if ((fd = canvas_open2(canvas, filename, sys_dllextent , &dirbuf, &nameptr, 1)) >= 0) goto gotone; if ((fd = canvas_open2(canvas, filename, sys_dllextent2, &dirbuf, &nameptr, 1)) >= 0) goto gotone; --- 119,123 ---- if ((fd = canvas_open2(canvas, objectname, sys_dllextent2, &dirbuf, &nameptr, 1)) >= 0) goto gotone; /* next try (objectname)/(classname).(sys_dllextent) ... */ ! asprintf(&filename,"%s/%s",objectname,classname); if ((fd = canvas_open2(canvas, filename, sys_dllextent , &dirbuf, &nameptr, 1)) >= 0) goto gotone; if ((fd = canvas_open2(canvas, filename, sys_dllextent2, &dirbuf, &nameptr, 1)) >= 0) goto gotone; *************** *** 131,146 **** class_set_extern_dir(gensym(dirbuf)); /* rebuild the absolute pathname */ ! strncpy(filename, dirbuf, MAXPDSTRING); ! filename[MAXPDSTRING-2] = 0; ! strcat(filename, "/"); ! strncat(filename, nameptr, MAXPDSTRING-strlen(filename)); ! filename[MAXPDSTRING-1] = 0; #ifdef DL_OPEN void *dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); if (!dlobj) { post("%s: %s", filename, dlerror()); ! class_set_extern_dir(&s_); ! free(symname); free(dirbuf); ! return 0; } makeout = (t_xxx)dlsym(dlobj, symname); --- 127,137 ---- class_set_extern_dir(gensym(dirbuf)); /* rebuild the absolute pathname */ ! free(filename); ! asprintf(&filename,"%s/%s",dirbuf,nameptr); #ifdef DL_OPEN void *dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); if (!dlobj) { post("%s: %s", filename, dlerror()); ! goto forgetit; } makeout = (t_xxx)dlsym(dlobj, symname); *************** *** 151,157 **** if (!ntdll) { post("%s: couldn't load", filename); ! class_set_extern_dir(&s_); ! free(symname); free(dirbuf); ! return 0; } makeout = (t_xxx)GetProcAddress(ntdll); --- 142,146 ---- if (!ntdll) { post("%s: couldn't load", filename); ! goto forgetit; } makeout = (t_xxx)GetProcAddress(ntdll); *************** *** 159,171 **** if (!makeout) { post("%s: can't find symbol '%s' in library", filename, symname); ! class_set_extern_dir(&s_); ! free(symname); free(dirbuf); ! return 0; } makeout(); class_set_extern_dir(&s_); sys_putonloadlist(objectname); ! free(symname); return 1; } --- 148,162 ---- if (!makeout) { post("%s: can't find symbol '%s' in library", filename, symname); ! goto forgetit; } makeout(); class_set_extern_dir(&s_); sys_putonloadlist(objectname); ! free(filename); free(symname); return 1; + forgetit: + class_set_extern_dir(&s_); + free(filename); free(symname); free(dirbuf); + return 0; }

1 0

pd/src TODO, 1.1.2.28.2.45, 1.1.2.28.2.46 ChangeLog, 1.1.4.11.2.24, 1.1.4.11.2.25
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20739 Modified Files: Tag: desiredata TODO ChangeLog Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.28.2.45 retrieving revision 1.1.2.28.2.46 diff -C2 -d -r1.1.2.28.2.45 -r1.1.2.28.2.46 *** TODO 18 Jul 2007 20:23:51 -0000 1.1.2.28.2.45 --- TODO 19 Jul 2007 22:43:55 -0000 1.1.2.28.2.46 *************** *** 6,10 **** [ ] [error] - [ ] merge error() and pd_error() [ ] localise error messages [ ] colorised console with hyperlinked error messages --- 6,9 ---- *************** *** 457,458 **** --- 456,459 ---- want it s/he can Ctrl+z it. + http://www.graphdrawing.org/ + Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.4.11.2.24 retrieving revision 1.1.4.11.2.25 diff -C2 -d -r1.1.4.11.2.24 -r1.1.4.11.2.25 *** ChangeLog 17 Jul 2007 19:10:21 -0000 1.1.4.11.2.24 --- ChangeLog 19 Jul 2007 22:43:55 -0000 1.1.4.11.2.25 *************** *** 1,3 **** ! DesireData 2007.07.15 : * added classes [unpost], [tracecall], [parse], [unparse] --- 1,3 ---- ! DesireData 2007.07.20 : * added classes [unpost], [tracecall], [parse], [unparse] *************** *** 8,11 **** --- 8,15 ---- * added keyboard view * fixed several bugs in copy/paste, undo/redo, subpatches, gop. + * added atom_ostream (similar to atom_string) + * lifted many string length restrictions + * fixed the hexmunge generator (for classnames with special chars) + * pd_error() is deprecated; added verror() DesireData 2007.06.27 (which should have been 2007.01.12) :

1 0

pd/src desire.c, 1.1.2.217.2.171, 1.1.2.217.2.172 desire.h, 1.1.2.49.2.32, 1.1.2.49.2.33
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18412 Modified Files: Tag: desiredata desire.c desire.h Log Message: renamed DT_LIST to DT_CANVAS Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.32 retrieving revision 1.1.2.49.2.33 diff -C2 -d -r1.1.2.49.2.32 -r1.1.2.49.2.33 *** desire.h 18 Jul 2007 20:23:15 -0000 1.1.2.49.2.32 --- desire.h 19 Jul 2007 22:37:43 -0000 1.1.2.49.2.33 *************** *** 187,191 **** #define DT_FLOAT 0 #define DT_SYMBOL 1 ! #define DT_LIST 2 #define DT_ARRAY 3 --- 187,191 ---- #define DT_FLOAT 0 #define DT_SYMBOL 1 ! #define DT_CANVAS 2 #define DT_ARRAY 3 *************** *** 293,297 **** /* -------------------- TO BE SORTED OUT --------------------- */ EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); - EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, int n); EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); --- 293,296 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.171 retrieving revision 1.1.2.217.2.172 diff -C2 -d -r1.1.2.217.2.171 -r1.1.2.217.2.172 *** desire.c 19 Jul 2007 21:47:34 -0000 1.1.2.217.2.171 --- desire.c 19 Jul 2007 22:37:40 -0000 1.1.2.217.2.172 *************** *** 1287,1291 **** t_class *array_class; ! t_array *array_new(t_symbol *templatesym, t_gpointer *parent) { t_array *x = (t_array *)pd_new(array_class); t_template *t = template_findbyname(templatesym); --- 1287,1291 ---- t_class *array_class; ! static t_array *array_new(t_symbol *templatesym, t_gpointer *parent) { t_array *x = (t_array *)pd_new(array_class); t_template *t = template_findbyname(templatesym); *************** *** 1295,1301 **** /* aligned allocation */ x->vec = (char *)getalignedbytes(x->elemsize); ! /* note here we blithely copy a gpointer instead of "setting" a ! new one; this gpointer isn't accounted for and needn't be since ! we'll be deleted before the thing pointed to gets deleted anyway; see array_free. */ x->gp = *parent; word_init((t_word *)x->vec, t, parent); --- 1295,1300 ---- /* aligned allocation */ x->vec = (char *)getalignedbytes(x->elemsize); ! /* note here we blithely copy a gpointer instead of "setting" a new one; this gpointer isn't accounted for ! and needn't be since we'll be deleted before the thing pointed to gets deleted anyway; see array_free. */ x->gp = *parent; word_init((t_word *)x->vec, t, parent); *************** *** 2492,2496 **** nitems++; } ! } else if (t->vec[i].type == DT_LIST) { while (1) { if (!canvas_readscalar(w->w_canvas, natoms, vec, p_nextmsg, 0)) break; --- 2491,2495 ---- nitems++; } ! } else if (t->vec[i].type == DT_CANVAS) { while (1) { if (!canvas_readscalar(w->w_canvas, natoms, vec, p_nextmsg, 0)) break; *************** *** 2691,2695 **** canvas_writescalar(arraytemplatesym, (t_word *)&a->vec[elemsize*j], b, 1); binbuf_addsemi(b); ! } else if (t->vec[i].type == DT_LIST) { canvas_writelist(w->w_canvas->list, b); binbuf_addsemi(b); --- 2690,2694 ---- canvas_writescalar(arraytemplatesym, (t_word *)&a->vec[elemsize*j], b, 1); binbuf_addsemi(b); ! } else if (t->vec[i].type == DT_CANVAS) { canvas_writelist(w->w_canvas->list, b); binbuf_addsemi(b); *************** *** 2720,2724 **** for (int j=0; j<nitems; j++) canvas_addtemplatesforscalar(arraytemplatesym, (t_word *)&a->vec[elemsize*j], p_ntemplates, p_templatevec); ! } else if (ds->type == DT_LIST) canvas_addtemplatesforlist(w->w_canvas->list, p_ntemplates, p_templatevec); } --- 2719,2723 ---- for (int j=0; j<nitems; j++) canvas_addtemplatesforscalar(arraytemplatesym, (t_word *)&a->vec[elemsize*j], p_ntemplates, p_templatevec); ! } else if (ds->type == DT_CANVAS) canvas_addtemplatesforlist(w->w_canvas->list, p_ntemplates, p_templatevec); } *************** *** 2752,2756 **** case DT_SYMBOL: type = &s_symbol; break; case DT_ARRAY: type = gensym("array"); break; ! case DT_LIST: type = &s_list; break; default: type = &s_float; bug("canvas_write"); } --- 2751,2755 ---- case DT_SYMBOL: type = &s_symbol; break; case DT_ARRAY: type = gensym("array"); break; ! case DT_CANVAS: type = &s_list; break; default: type = &s_float; bug("canvas_write"); } *************** *** 2862,2866 **** case DT_SYMBOL: type = &s_symbol; break; case DT_ARRAY: type = gensym("array"); break; ! case DT_LIST: type = &s_list; break; default: type = &s_float; bug("canvas_write"); } --- 2861,2865 ---- case DT_SYMBOL: type = &s_symbol; break; case DT_ARRAY: type = gensym("array"); break; ! case DT_CANVAS: type = &s_list; break; default: type = &s_float; bug("canvas_write"); } *************** *** 3356,3360 **** else if (type == DT_SYMBOL) wp->w_symbol = &s_symbol; else if (type == DT_ARRAY) wp->w_array = array_new(datatypes->arraytemplate, gp); ! else if (type == DT_LIST) { /* LATER test this and get it to work */ wp->w_canvas = canvas_new(0,0,0,0); --- 3355,3359 ---- else if (type == DT_SYMBOL) wp->w_symbol = &s_symbol; else if (type == DT_ARRAY) wp->w_array = array_new(datatypes->arraytemplate, gp); ! else if (type == DT_CANVAS) { /* LATER test this and get it to work */ wp->w_canvas = canvas_new(0,0,0,0); *************** *** 3383,3388 **** t_dataslot *dt = t->vec; for (int i=0; i<t->n; i++, dt++) { ! if (dt->type == DT_ARRAY) pd_free(wp[i].w_array); ! else if (dt->type == DT_LIST) pd_free(wp[i].w_canvas); } } --- 3382,3387 ---- t_dataslot *dt = t->vec; for (int i=0; i<t->n; i++, dt++) { ! if (dt->type == DT_ARRAY) pd_free(wp[i].w_array); ! else if (dt->type == DT_CANVAS) pd_free(wp[i].w_canvas); } } *************** *** 3586,3590 **** if (newtypesym == &s_float) newtype = DT_FLOAT; else if (newtypesym == &s_symbol) newtype = DT_SYMBOL; ! else if (newtypesym == &s_list) newtype = DT_LIST; else if (newtypesym == gensym("array")) { if (argc < 3 || argv[2].a_type != A_SYMBOL) {error("array lacks element template or name"); goto bad;} --- 3585,3589 ---- if (newtypesym == &s_float) newtype = DT_FLOAT; else if (newtypesym == &s_symbol) newtype = DT_SYMBOL; ! else if (newtypesym == &s_list) newtype = DT_CANVAS; else if (newtypesym == gensym("array")) { if (argc < 3 || argv[2].a_type != A_SYMBOL) {error("array lacks element template or name"); goto bad;} *************** *** 3656,3660 **** if (x1->n < x2->n) return 0; for (int i=x2->n; i < x1->n; i++) ! if (x1->vec[i].type == DT_ARRAY || x1->vec[i].type == DT_LIST) return 0; if (x2->n > x1->n) post("add elements..."); for (int i=0; i < x2->n; i++) if (!dataslot_matches(&x1->vec[i], &x2->vec[i], 1)) return 0; --- 3655,3659 ---- if (x1->n < x2->n) return 0; for (int i=x2->n; i < x1->n; i++) ! if (x1->vec[i].type == DT_ARRAY || x1->vec[i].type == DT_CANVAS) return 0; if (x2->n > x1->n) post("add elements..."); for (int i=0; i < x2->n; i++) if (!dataslot_matches(&x1->vec[i], &x2->vec[i], 1)) return 0; *************** *** 3721,3726 **** for (int i=0; i < scalartemplate->n; i++) { t_dataslot *ds = scalartemplate->vec + i; ! if (ds->type == DT_LIST) template_conformcanvas(tfrom, tto, conformaction, x->v[i].w_canvas); ! if (ds->type == DT_ARRAY) template_conformarray(tfrom, tto, conformaction, x->v[i].w_array); } return x; --- 3720,3725 ---- for (int i=0; i < scalartemplate->n; i++) { t_dataslot *ds = scalartemplate->vec + i; ! if (ds->type == DT_CANVAS) template_conformcanvas(tfrom, tto, conformaction, x->v[i].w_canvas); ! if (ds->type == DT_ARRAY) template_conformarray( tfrom, tto, conformaction, x->v[i].w_array); } return x; *************** *** 3752,3757 **** for (int j=0; j < scalartemplate->n; j++) { t_dataslot *ds = scalartemplate->vec + j; ! if (ds->type == DT_LIST) template_conformcanvas(tfrom, tto, conformaction, wp[j].w_canvas); ! if (ds->type == DT_ARRAY) template_conformarray( tfrom, tto, conformaction, wp[j].w_array); } } --- 3751,3756 ---- for (int j=0; j < scalartemplate->n; j++) { t_dataslot *ds = scalartemplate->vec + j; ! if (ds->type == DT_CANVAS) template_conformcanvas(tfrom, tto, conformaction, wp[j].w_canvas); ! if (ds->type == DT_ARRAY) template_conformarray( tfrom, tto, conformaction, wp[j].w_array); } } *************** *** 5233,5237 **** return; } ! if (type != DT_LIST) {error("field %s not of type list", x->fieldsym->name); return;} t_word *w = gpointer_word(gp); gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); --- 5232,5236 ---- return; } ! if (type != DT_CANVAS) {error("field %s not of type list", x->fieldsym->name); return;} t_word *w = gpointer_word(gp); gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0);

1 0

pd/src m_pd.h,1.4.4.11.2.33.2.57,1.4.4.11.2.33.2.58
by Mathieu Bouchard 20 Jul '07

20 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14468 Modified Files: Tag: desiredata m_pd.h Log Message: temporary pointer gimmick Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.57 retrieving revision 1.4.4.11.2.33.2.58 diff -C2 -d -r1.4.4.11.2.33.2.57 -r1.4.4.11.2.33.2.58 *** m_pd.h 19 Jul 2007 21:07:44 -0000 1.4.4.11.2.33.2.57 --- m_pd.h 19 Jul 2007 22:27:39 -0000 1.4.4.11.2.33.2.58 *************** *** 119,122 **** --- 119,125 ---- struct t_text *o; }; + size_t dummy; + size_t refcount; + //#define gs_refcount refcount #define gs_refcount canvas->refcount } t_gpointer; *************** *** 132,136 **** struct _text *o; } un; ! #define gs_refcount un.canvas->gl_obj.refcount } t_gpointer; #endif --- 135,142 ---- struct _text *o; } un; ! size_t dummy; ! size_t refcount; ! //#define gs_refcount un.canvas->gl_obj.refcount ! #define gs_refcount refcount } t_gpointer; #endif

1 0

pd/src desire.c,1.1.2.217.2.170,1.1.2.217.2.171
by Mathieu Bouchard 19 Jul '07

19 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31060 Modified Files: Tag: desiredata desire.c Log Message: wipe the rest of gstub Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.170 retrieving revision 1.1.2.217.2.171 diff -C2 -d -r1.1.2.217.2.170 -r1.1.2.217.2.171 *** desire.c 19 Jul 2007 17:54:50 -0000 1.1.2.217.2.170 --- desire.c 19 Jul 2007 21:47:34 -0000 1.1.2.217.2.171 *************** *** 1321,1325 **** static void array_resize_and_redraw(t_array *array, int n) { /* what was that for??? */ - /* t_array *a2 = array; while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->array; */ array_resize(array,n); gobj_changed(array,0); --- 1321,1324 ---- *************** *** 1584,1588 **** static void array_redraw(t_array *a, t_canvas *canvas) { /* what was that for? */ - /* while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; */ scalar_redraw(a->gp.scalar, canvas); } --- 1583,1586 ---- *************** *** 3395,3417 **** static t_canvas *gpointer_getcanvas(t_gpointer *gp) { if (gp->o->_class != array_class) return gp->canvas; - else {/* fuck: - t_array *owner_array = gp->array; - // find associated scalar: - while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; - return STUB(owner_array)->canvas; - */} return 0; /* FIXME */ } static t_scalar *gpointer_getscalar(t_gpointer *gp) { if (gp->o->_class != array_class) return gp->scalar; - /* t_array *o = gp->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; return o->gp.scalar; */ return 0; } ! /* make a new scalar and add to the canvas. We create a "gp" here which ! will be used for array items to point back here. This gp doesn't do ! reference counting or "validation" updates though; the parent won't go away ! without the contained arrays going away too. The "gp" is copied out ! by value in the word_init() routine so we can throw our copy away. */ t_scalar *scalar_new(t_canvas *owner, t_symbol *templatesym) { t_gpointer gp; --- 3393,3406 ---- static t_canvas *gpointer_getcanvas(t_gpointer *gp) { if (gp->o->_class != array_class) return gp->canvas; return 0; /* FIXME */ } static t_scalar *gpointer_getscalar(t_gpointer *gp) { if (gp->o->_class != array_class) return gp->scalar; return 0; } ! /* make a new scalar and add to the canvas. We create a "gp" here which will be used for array items to point back here. ! This gp doesn't do reference counting or "validation" updates though; the parent won't go away without the contained ! arrays going away too. The "gp" is copied out by value in the word_init() routine so we can throw our copy away. */ t_scalar *scalar_new(t_canvas *owner, t_symbol *templatesym) { t_gpointer gp; *************** *** 3431,3438 **** static void canvas_scalar(t_canvas *canvas, t_symbol *classname, t_int argc, t_atom *argv) { t_symbol *templatesym = canvas_makebindsym(atom_getsymbolarg(0, argc, argv)); ! if (!template_findbyname(templatesym)) { ! error("%s: no such template", atom_getsymbolarg(0, argc, argv)->name); ! return; ! } int nextmsg; t_binbuf *b = binbuf_new(); --- 3420,3424 ---- static void canvas_scalar(t_canvas *canvas, t_symbol *classname, t_int argc, t_atom *argv) { t_symbol *templatesym = canvas_makebindsym(atom_getsymbolarg(0, argc, argv)); ! if (!template_findbyname(templatesym)) {error("%s: no such template", atom_getsymbolarg(0, argc, argv)->name); return;} int nextmsg; t_binbuf *b = binbuf_new(); *************** *** 4717,4736 **** /* ------------- gpointers - safe pointing --------------- */ - /* - static void gstub_dis(t_gstub *gs) { - int refcount = --gs->gs_refcount; - if (!refcount && gstub_which(gs) == GP_NONE) free(gs); - else if (refcount < 0) bug("gstub_dis"); - } - static int gstub_which(t_gstub *gs) { - if (gs->array) return 0; - if (gs->array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; - } - */ ! /* call this to verify that a pointer is fresh, i.e., that it either ! points to real data or to the head of a list, and that in either case ! the object hasn't disappeared since this pointer was generated. ! Unless "headok" is set, the routine also fails for the head of a list. */ int gpointer_check(const t_gpointer *gp, int headok) { if (!gp->o) return 0; --- 4703,4710 ---- /* ------------- gpointers - safe pointing --------------- */ ! /* call this to verify that a pointer is fresh, i.e., that it either points to real data or to the head of a list, ! and that in either case the object hasn't disappeared since this pointer was generated. Unless "headok" is set, ! the routine also fails for the head of a list. */ int gpointer_check(const t_gpointer *gp, int headok) { if (!gp->o) return 0; *************** *** 4739,4744 **** } ! /* get the template for the object pointer to. Assumes we've already checked ! freshness. Returns 0 if head of list. */ static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { if (gp->o->_class == array_class) return gp->array->templatesym; --- 4713,4717 ---- } ! /* get the template for the object pointer to. Assumes we've already checked freshness. Returns 0 if head of list. */ static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { if (gp->o->_class == array_class) return gp->array->templatesym; *************** *** 4747,4753 **** } ! /* copy a pointer to another, assuming the second one hasn't yet been ! initialized. New gpointers should be initialized either by this ! routine or by gpointer_init below. */ void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto) { *gpto = *gpfrom; --- 4720,4725 ---- } ! /* copy a pointer to another, assuming the second one hasn't yet been initialized. New gpointers should be initialized ! either by this routine or by gpointer_init below. */ void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto) { *gpto = *gpfrom; *************** *** 4755,4760 **** } - /* clear a gpointer that was previously set, releasing the associated - gstub if this was the last reference to it. */ void gpointer_unset(t_gpointer *gp) { if (gp->scalar) { --- 4727,4730 ---- *************** *** 5035,5039 **** t_array *array; int elemsize, type; - if (!gpointer_check(gparent, 0)) {error("empty pointer"); return;} if (gpointer_gettemplatesym(gparent) != x->templatesym) { --- 5005,5008 ----

1 0

pd/src s_audio_jack.c,1.5.4.8.2.7.2.11,1.5.4.8.2.7.2.12
by Mathieu Bouchard 19 Jul '07

19 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15757 Modified Files: Tag: desiredata s_audio_jack.c Log Message: cleanup Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.8.2.7.2.11 retrieving revision 1.5.4.8.2.7.2.12 diff -C2 -d -r1.5.4.8.2.7.2.11 -r1.5.4.8.2.7.2.12 *** s_audio_jack.c 12 Jul 2007 00:05:30 -0000 1.5.4.8.2.7.2.11 --- s_audio_jack.c 19 Jul 2007 21:09:18 -0000 1.5.4.8.2.7.2.12 *************** *** 86,106 **** } for (int i = 0; i != dspticks_per_jacktick; ++i) { - /* get sound from the inputs */ for (int j=0; j<sys_inchannels; j++) { t_sample *in = (t_sample *)jack_port_get_buffer(input_port[j], nframes); copyblock(sys_soundin + j * sys_dacblocksize, in + i * sys_dacblocksize, sys_dacblocksize); } - /* run dsp */ sched_tick(sys_time + sys_time_per_dsp_tick); ! /* send sound to the output */ ! int j; ! for (j=0; j<sys_outchannels; j++) { t_sample *out = (t_sample *)jack_port_get_buffer (output_port[j], nframes); copyblock(out + i * sys_dacblocksize, sys_soundout + j * sys_dacblocksize, sys_dacblocksize); } - /* update peak meters */ if (sys_meters) sys_peakmeters(); ! /* clear the output buffer */ ! zeroblock(sys_soundout, j * sys_dacblocksize); } run_all_idle_callbacks(); --- 86,100 ---- } for (int i = 0; i != dspticks_per_jacktick; ++i) { for (int j=0; j<sys_inchannels; j++) { t_sample *in = (t_sample *)jack_port_get_buffer(input_port[j], nframes); copyblock(sys_soundin + j * sys_dacblocksize, in + i * sys_dacblocksize, sys_dacblocksize); } sched_tick(sys_time + sys_time_per_dsp_tick); ! for (int j=0; j<sys_outchannels; j++) { t_sample *out = (t_sample *)jack_port_get_buffer (output_port[j], nframes); copyblock(out + i * sys_dacblocksize, sys_soundout + j * sys_dacblocksize, sys_dacblocksize); } if (sys_meters) sys_peakmeters(); ! zeroblock(sys_soundout, sys_outchannels * sys_dacblocksize); } run_all_idle_callbacks(); *************** *** 141,145 **** /* Build a list of clients from the list of ports */ for (int i=0; jack_ports[i] != 0; i++) { - int client_seen; regmatch_t match_info; char tmp_client_name[100]; --- 135,138 ---- *************** *** 149,153 **** tmp_client_name[ match_info.rm_eo - match_info.rm_so ] = '\0'; /* do we know about this port's client yet? */ ! client_seen = 0; for (int j=0; j<num_clients; j++) if (strcmp(tmp_client_name, jack_client_names[j])==0) client_seen = 1; if (!client_seen) { --- 142,146 ---- tmp_client_name[ match_info.rm_eo - match_info.rm_so ] = '\0'; /* do we know about this port's client yet? */ ! int client_seen = 0; for (int j=0; j<num_clients; j++) if (strcmp(tmp_client_name, jack_client_names[j])==0) client_seen = 1; if (!client_seen) { *************** *** 354,364 **** for (int i=0; i<NUM_JACK_PORTS; i++) { /* saving the inputs connections */ ! if (jack_in_connections[i]) free(jack_in_connections[i]); ! if (i < sys_inchannels) jack_in_connections[i] = jack_port_get_all_connections(jack_client, input_port[i]); ! else jack_in_connections[i] = 0; /* saving the outputs connections */ if (jack_out_connections[i]) free(jack_out_connections[i]); ! if (i < sys_outchannels) jack_out_connections[i] = jack_port_get_all_connections(jack_client, output_port[i]); ! else jack_out_connections[i] = 0; } return 0; --- 347,355 ---- for (int i=0; i<NUM_JACK_PORTS; i++) { /* saving the inputs connections */ ! if ( jack_in_connections[i]) free( jack_in_connections[i]); ! jack_in_connections[i] = i< sys_inchannels ? jack_port_get_all_connections(jack_client, input_port[i]) : 0; /* saving the outputs connections */ if (jack_out_connections[i]) free(jack_out_connections[i]); ! jack_out_connections[i]= i<sys_outchannels ? jack_port_get_all_connections(jack_client, output_port[i]) : 0; } return 0; *************** *** 372,379 **** if (jack_in_connections[i]) { for (int j=0;;j++) { ! const char *src_port = jack_in_connections[i][j]; ! if (!src_port) break; /* we've connected all incoming ports */ ! int status = jack_connect(jack_client, src_port, jack_port_name(input_port[i])); ! if (status) post("cannot connect input ports %s -> %s", src_port, jack_port_name (input_port[i])); } } --- 363,370 ---- if (jack_in_connections[i]) { for (int j=0;;j++) { ! const char *port = jack_in_connections[i][j]; ! if (!port) break; /* we've connected all incoming ports */ ! int status = jack_connect(jack_client, port, jack_port_name(input_port[i])); ! if (status) post("cannot connect input ports %s -> %s", port, jack_port_name (input_port[i])); } } *************** *** 381,388 **** if (jack_out_connections[i]) { for (int j=0;;j++) { ! const char *dst_port = jack_out_connections[i][j]; ! if (!dst_port) break; /* we've connected all outgoing ports */ ! int status = jack_connect(jack_client, jack_port_name(output_port[i]), dst_port); ! if (status) post("cannot connect output ports %s -> %s", jack_port_name(output_port[i]), dst_port); } } --- 372,379 ---- if (jack_out_connections[i]) { for (int j=0;;j++) { ! const char *port = jack_out_connections[i][j]; ! if (!port) break; /* we've connected all outgoing ports */ ! int status = jack_connect(jack_client, jack_port_name(output_port[i]), port); ! if (status) post("cannot connect output ports %s -> %s", jack_port_name(output_port[i]), port); } }

1 0

pd/src m_sched.c, 1.5.4.35.2.21.2.13, 1.5.4.35.2.21.2.14 s_loader.c, 1.4.4.5.2.10.2.7, 1.4.4.5.2.10.2.8 s_path.c, 1.3.4.6.2.8.2.9, 1.3.4.6.2.8.2.10
by Mathieu Bouchard 19 Jul '07

19 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15351 Modified Files: Tag: desiredata m_sched.c s_loader.c s_path.c Log Message: cleanup Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.4.4.5.2.10.2.7 retrieving revision 1.4.4.5.2.10.2.8 diff -C2 -d -r1.4.4.5.2.10.2.7 -r1.4.4.5.2.10.2.8 *** s_loader.c 19 Jul 2007 01:30:16 -0000 1.4.4.5.2.10.2.7 --- s_loader.c 19 Jul 2007 21:08:45 -0000 1.4.4.5.2.10.2.8 *************** *** 15,19 **** #endif #ifdef __APPLE__ ! #include <mach-o/dyld.h> #endif #include <string.h> --- 15,19 ---- #endif #ifdef __APPLE__ ! #include <mach-o/dyld.h> #endif #include <string.h> *************** *** 56,60 **** #endif ! /* maintain list of loaded modules to avoid repeating loads */ struct t_loadlist { t_loadlist *ll_next; --- 56,60 ---- #endif ! /* maintain list of loaded modules to avoid repeating loads */ struct t_loadlist { t_loadlist *ll_next; *************** *** 172,192 **** /* callback type definition */ typedef int (*t_loader)(t_canvas *canvas, char *classname); - typedef t_loader loader_t; /* linked list of loaders */ typedef struct t_loader_queue { ! loader_t loader; t_loader_queue *next; ! } loader_queue_t; ! static loader_queue_t loaders = {sys_do_load_lib, NULL}; /* register class loader function */ ! void sys_register_loader(loader_t loader) { ! loader_queue_t *q = &loaders; while (1) { if (q->next) q = q->next; else { ! q->next = (loader_queue_t *)getbytes(sizeof(loader_queue_t)); q->next->loader = loader; q->next->next = NULL; --- 172,191 ---- /* callback type definition */ typedef int (*t_loader)(t_canvas *canvas, char *classname); /* linked list of loaders */ typedef struct t_loader_queue { ! t_loader loader; t_loader_queue *next; ! }; ! static t_loader_queue loaders = {sys_do_load_lib, NULL}; /* register class loader function */ ! void sys_register_loader(t_loader loader) { ! t_loader_queue *q = &loaders; while (1) { if (q->next) q = q->next; else { ! q->next = (t_loader_queue *)getbytes(sizeof(t_loader_queue)); q->next->loader = loader; q->next->next = NULL; *************** *** 199,204 **** int dspstate = canvas_suspend_dsp(); int ok = 0; ! loader_queue_t *q; ! for(q = &loaders; q; q = q->next) if ((ok = q->loader(canvas, classname))) break; canvas_resume_dsp(dspstate); return ok; --- 198,202 ---- int dspstate = canvas_suspend_dsp(); int ok = 0; ! for(t_loader_queue *q = &loaders; q; q = q->next) if ((ok = q->loader(canvas, classname))) break; canvas_resume_dsp(dspstate); return ok; Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.13 retrieving revision 1.5.4.35.2.21.2.14 diff -C2 -d -r1.5.4.35.2.21.2.13 -r1.5.4.35.2.21.2.14 *** m_sched.c 10 Jul 2007 06:12:55 -0000 1.5.4.35.2.21.2.13 --- m_sched.c 19 Jul 2007 21:08:45 -0000 1.5.4.35.2.21.2.14 *************** *** 360,367 **** 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"); --- 360,365 ---- 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"); *************** *** 374,386 **** } } 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(); --- 372,381 ---- } } 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(); Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.6.2.8.2.9 retrieving revision 1.3.4.6.2.8.2.10 diff -C2 -d -r1.3.4.6.2.8.2.9 -r1.3.4.6.2.8.2.10 *** s_path.c 18 Jul 2007 23:55:27 -0000 1.3.4.6.2.8.2.9 --- s_path.c 19 Jul 2007 21:08:46 -0000 1.3.4.6.2.8.2.10 *************** *** 3,14 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! /* ! * This file implements the loader for linux, which includes ! * a little bit of path handling. ! * ! * Generalized by MSP to provide an open_via_path function ! * and lists of files for all purposes. ! */ ! /* #define DEBUG(x) x */ #define DEBUG(x) --- 3,8 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! /* This file implements the loader for linux, which includes a little bit of path handling. ! * Generalized by MSP to provide an open_via_path function and lists of files for all purposes. */ /* #define DEBUG(x) x */ #define DEBUG(x) *************** *** 267,271 **** char buf[1000]; char c[MAXPDSTRING]; ! int retval = 1; /* that's what we will return at the end; for now, let's think it'll be an error */ /* initialize rc-arg-array so we can safely clean up at the end */ for (i = 1; i < NUMARGS-1; i++) rcargv[i]=0; --- 261,265 ---- char buf[1000]; char c[MAXPDSTRING]; ! int retval = 1; /* that's what we will return at the end; for now, let's think it'll be an error */ /* initialize rc-arg-array so we can safely clean up at the end */ for (i = 1; i < NUMARGS-1; i++) rcargv[i]=0; *************** *** 322,330 **** char fname[MAXPDSTRING], *home = getenv("HOME"); // parse a startup file */ ! *fname = '\0'; strncat(fname, home? home : ".", MAXPDSTRING-10); strcat(fname, "/"); strcat(fname, STARTUPNAME); ! return sys_parsercfile(fname); } #endif /* MSW */ --- 316,324 ---- char fname[MAXPDSTRING], *home = getenv("HOME"); // parse a startup file */ ! *fname = '\0'; strncat(fname, home? home : ".", MAXPDSTRING-10); strcat(fname, "/"); strcat(fname, STARTUPNAME); ! return sys_parsercfile(fname); } #endif /* MSW */

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
63
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 July 2007