Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15557

Modified Files: Tag: desiredata kernel.c makefile.in Removed Files: Tag: desiredata m_binbuf.c Log Message: merged m_binbuf.c into kernel.c

Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.16 retrieving revision 1.4.4.2.2.21.2.17 diff -C2 -d -r1.4.4.2.2.21.2.16 -r1.4.4.2.2.21.2.17 *** makefile.in 28 Dec 2006 00:30:42 -0000 1.4.4.2.2.21.2.16 --- makefile.in 28 Dec 2006 00:46:45 -0000 1.4.4.2.2.21.2.17 *************** *** 29,34 ****

# from pd miller ! SRC += m_binbuf.c m_sched.c \ ! s_main.c s_inter.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ --- 29,33 ----

# from pd miller ! SRC += m_sched.c s_main.c s_inter.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \

--- m_binbuf.c DELETED ---

Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** kernel.c 28 Dec 2006 00:30:42 -0000 1.1.2.10 --- kernel.c 28 Dec 2006 00:46:45 -0000 1.1.2.11 *************** *** 1749,1752 **** --- 1749,2751 ---- }

+ /* Copyright 2006-2007 Mathieu Bouchard. + * Copyright 1997-2006 Miller Puckette. + * For information on usage and redistribution, and for a DISCLAIMER OF ALL + * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + + /* IOhannes : + * changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test") [...974 lines suppressed...] + canvas_resume_dsp(dspstate); + } + + void glob_evalfile(t_pd *ignore, t_symbol *name, t_symbol *dir) { + t_pd *x = 0; + /* even though binbuf_evalfile appears to take care of dspstate, + we have to do it again here, because canvas_startdsp() assumes + that all toplevel canvases are visible. LATER check if this + is still necessary -- probably not. */ + + int dspstate = canvas_suspend_dsp(); + binbuf_evalfile(name, dir); + while ((x != s__X.s_thing) && (x = s__X.s_thing)) + vmess(x, gensym("pop"), "i", 1); + pd_doloadbang(); + canvas_resume_dsp(dspstate); + } + void mess_init(void); void conf_init(void);