Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9934/pd/src
Modified Files: d_ugen.c s_audio_pablio.h s_audio_paring.c s_audio_paring.h s_inter.c s_loader.c u_main.tk Log Message: Bug fix in audio blocking
Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** s_loader.c 15 Aug 2006 04:54:15 -0000 1.10 --- s_loader.c 15 Aug 2006 16:09:57 -0000 1.11 *************** *** 77,81 **** ll->ll_next = sys_loaded; sys_loaded = ll; ! post("put on list %s", classname); }
--- 77,81 ---- ll->ll_next = sys_loaded; sys_loaded = ll; ! /* post("put on list %s", classname); */ }
*************** *** 95,99 **** classname++; else classname = objectname; - post("classname %s", classname); if (sys_onloadlist(classname)) { --- 95,98 ---- *************** *** 131,135 **** else strcat(symname, "_setup");
! #if 1 fprintf(stderr, "lib: %s\n", classname); #endif --- 130,134 ---- else strcat(symname, "_setup");
! #if 0 fprintf(stderr, "lib: %s\n", classname); #endif
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** u_main.tk 15 Aug 2006 04:54:15 -0000 1.21 --- u_main.tk 15 Aug 2006 16:09:57 -0000 1.22 *************** *** 36,41 **** global pd_tearoff set pd_gui2 [string range $argv0 0 [expr [string last \ $argv0 ] - 1]] ! regsub -all \\ $pd_gui2 / pd_guidir ! set pd_guidir [string range $pd_guidir 0 [expr [string last / $pd_guidir] - 1]] load $pd_guidir/bin/pdtcl.dll set pd_tearoff 1 --- 36,41 ---- global pd_tearoff set pd_gui2 [string range $argv0 0 [expr [string last \ $argv0 ] - 1]] ! regsub -all \\ $pd_gui2 / pd_gui3 ! set pd_guidir $pd_gui3/.. load $pd_guidir/bin/pdtcl.dll set pd_tearoff 1 *************** *** 372,376 **** set bigstring [read $f 1000] regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2 ! $name.text insert end $bigstring2 } close $f --- 372,377 ---- set bigstring [read $f 1000] regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2 ! regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3 ! $name.text insert end $bigstring3 } close $f *************** *** 3244,3250 ****
# tb: user defined typefaces ! proc pdtk_pd_startup {apilist midiapilist fontname} { ! # puts stderr [concat $apilist $midiapilist $fontname] ! global pd_apilist pd_midiapilist set pd_apilist $apilist set pd_midiapilist $midiapilist --- 3245,3252 ----
# tb: user defined typefaces ! proc pdtk_pd_startup {version apilist midiapilist fontname} { ! # puts stderr [concat $version $apilist $fontname] ! global pd_myversion pd_apilist pd_midiapilist ! set pd_myversion $version set pd_apilist $apilist set pd_midiapilist $midiapilist
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** s_inter.c 15 Aug 2006 04:54:15 -0000 1.17 --- s_inter.c 15 Aug 2006 16:09:57 -0000 1.18 *************** *** 86,89 **** --- 86,90 ---- };
+ extern char *pd_version; extern int sys_guisetportnumber; extern char sys_font[]; /* tb: typeface */ *************** *** 1248,1252 **** sys_get_audio_apis(buf); sys_get_midi_apis(buf2); ! sys_vgui("pdtk_pd_startup %s %s {%s}\n", buf, buf2, sys_font); } return (0); --- 1249,1254 ---- sys_get_audio_apis(buf); sys_get_midi_apis(buf2); ! sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2, ! sys_font); } return (0);
Index: d_ugen.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ugen.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** d_ugen.c 15 Aug 2006 04:54:15 -0000 1.7 --- d_ugen.c 15 Aug 2006 16:09:57 -0000 1.8 *************** *** 954,957 **** --- 954,958 ---- srate = parent_srate; vecsize = parent_vecsize; + calcsize = (parent_context ? parent_context->dc_calcsize : vecsize); downsample = upsample = 1; period = frequency = 1;