Pd-cvs August 2007

pd-cvs@lists.iem.at

18 participants
618 discussions

pd/src desire.tk,1.1.2.600.2.400,1.1.2.600.2.401
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23359 Modified Files: Tag: desiredata desire.tk Log Message: fix for auto_apply Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.400 retrieving revision 1.1.2.600.2.401 diff -C2 -d -r1.1.2.600.2.400 -r1.1.2.600.2.401 *** desire.tk 19 Aug 2007 21:02:59 -0000 1.1.2.600.2.400 --- desire.tk 20 Aug 2007 03:15:52 -0000 1.1.2.600.2.401 *************** *** 5662,5667 **** pack $f.auto_apply $f.buttonsep2 -side bottom -fill x bind $f <KeyPress-Return> "break";#so that Return don't call do_auto_apply after Dialog ok ! bind $f <KeyPress> "after 1 $self do_auto_apply" ! bind $f <Button> "after 1 $self do_auto_apply" set @auto_apply 0 $self none_resizable --- 5662,5667 ---- pack $f.auto_apply $f.buttonsep2 -side bottom -fill x bind $f <KeyPress-Return> "break";#so that Return don't call do_auto_apply after Dialog ok ! bind $f <KeyPress> [list $self do_auto_apply] ! bind $f <ButtonRelease> [list $self do_auto_apply] set @auto_apply 0 $self none_resizable *************** *** 7226,7230 **** # place [message $f.label.1 -text $label -width $@label_width] -x 0 -y 0 # puts [$f.label.1 cget -height] ! pack [label $f.label -text $label -width [expr $@label_width/7] -wraplength $@label_width] -side left balloon $f.label $name } --- 7226,7230 ---- # place [message $f.label.1 -text $label -width $@label_width] -x 0 -y 0 # puts [$f.label.1 cget -height] ! pack [label $f.label -text $label -width [expr $@label_width/7] -wraplength $@label_width -anchor e] -side left balloon $f.label $name } *************** *** 7455,7459 **** libraries {$self add_libraries $f $name $label} devlist {$self add_devlist $f $name $label} ! spins {$self add_spins $f $name $label $options} section {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}} subsection {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}} --- 7455,7459 ---- libraries {$self add_libraries $f $name $label} devlist {$self add_devlist $f $name $label} ! spins {$self add_spins $f $name $label $options} section {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}} subsection {label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}} *************** *** 7673,7677 **** def Dialog ok {} {$self apply; $self cancel} ! def Dialog cancel {} {if {[info exists @nbs]} {foreach x $@nbs {$x delete}}; $self delete} def Dialog close {} {$self delete} def Dialog apply {} {} --- 7673,7677 ---- def Dialog ok {} {$self apply; $self cancel} ! def Dialog cancel {} {if {[info exists @nbs]} {foreach x $@nbs {$x delete}}; after 1 [list $self delete]} def Dialog close {} {$self delete} def Dialog apply {} {}

1 0

pd/src desire.tk,1.1.2.600.2.399,1.1.2.600.2.400
by Mathieu Bouchard 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533 Modified Files: Tag: desiredata desire.tk Log Message: changed meaning of [inside] to only half-open interval. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.399 retrieving revision 1.1.2.600.2.400 diff -C2 -d -r1.1.2.600.2.399 -r1.1.2.600.2.400 *** desire.tk 19 Aug 2007 01:52:36 -0000 1.1.2.600.2.399 --- desire.tk 19 Aug 2007 21:02:59 -0000 1.1.2.600.2.400 *************** *** 140,145 **** } ! # intervals ! proc inside {x x0 x1} {return [expr $x>=$x0 && $x<=$x1]} proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} --- 140,145 ---- } ! # one-dimensional intervals (left-closed, right-open); not much in use at the moment, not that they wouldn't deserve to! ! proc inside {x x0 x1} {return [expr $x>=$x0 && $x<$x1]} proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} *************** *** 4055,4059 **** # iolist stores in/outlets to be conected inside the subpatch ! foreach in $ins {mset {idx p} $in; lappend iolist [list i [$self idx_map $idx] $p]} foreach out $outs {mset {idx p} $out; lappend iolist [list o [$self idx_map $idx] $p]} puts "\t \t Cutting..............." --- 4055,4059 ---- # iolist stores in/outlets to be conected inside the subpatch ! foreach in $ins {mset {idx p} $in; lappend iolist [list i [$self idx_map $idx] $p]} foreach out $outs {mset {idx p} $out; lappend iolist [list o [$self idx_map $idx] $p]} puts "\t \t Cutting..............." *************** *** 7379,7383 **** set sel [$listbox curselection] if {$sel == ""} {return} ! if {![inside [expr $sel+$dir] 0 [expr [$listbox size] - 1]]} {return} set line [$listbox get $sel] $listbox delete $sel --- 7379,7383 ---- set sel [$listbox curselection] if {$sel == ""} {return} ! if {![inside [expr $sel+$dir] 0 [$listbox size]]} {return} set line [$listbox get $sel] $listbox delete $sel

1 0

autobuild: pd-extended debian-testing-powerpc 2007-08-19 06.42.19
by pd＠debian-testing-powerpc.idmi.poly.edu 19 Aug '07

19 Aug '07

install -d /home/pd/auto-build/pd-extended/packages/linux_make/build//usr/share/emacs/site-lisp/ install -p /home/pd/auto-build/pd-extended/scripts/pd-mode.el /home/pd/auto-build/pd-extended/packages/linux_make/build//usr/share/emacs/site-lisp/ install -p /home/pd/auto-build/pd-extended/scripts/pd-diff /home/pd/auto-build/pd-extended/packages/linux_make/build//usr/local/bin install -p /home/pd/auto-build/pd-extended/scripts/config-switcher.sh /home/pd/auto-build/pd-extended/packages/linux_make/build//usr/local/bin sed -i 's|^Version:.*|Version: 0.40.3cvs20070814-1|' \ /home/pd/auto-build/pd-extended/packages/linux_make/debian/control sed -i 's|^Architecture:.*|Architecture: powerpc|' \ /home/pd/auto-build/pd-extended/packages/linux_make/debian/control test -d /home/pd/auto-build/pd-extended/packages/linux_make/build//DEBIAN || mkdir -p /home/pd/auto-build/pd-extended/packages/linux_make/build//DEBIAN cp /home/pd/auto-build/pd-extended/packages/linux_make/debian/control /home/pd/auto-build/pd-extended/packages/linux_make/build//DEBIAN fakeroot dpkg-deb --build /home/pd/auto-build/pd-extended/packages/linux_make/build/ /home/pd/auto-build/pd-extended/packages/linux_make/Pd-0.40.3-extended-20070814.deb dpkg-deb: building package `pd-extended' in `/home/pd/auto-build/pd-extended/packages/linux_make/Pd-0.40.3-extended-20070814.deb'. upload specs linux_make . deb Uploading /home/pd/auto-build/pd-extended/packages/linux_make/./Pd*.deb rsync: writefd_unbuffered failed to write 4 bytes [sender]: Broken pipe (32) rsync error: timeout in data send/receive (code 30) at io.c(165) [receiver=2.6.9] rsync: connection unexpectedly closed (193 bytes received so far) [generator] rsync error: error in rsync protocol data stream (code 12) at io.c(453) [generator=2.6.9] rsync: connection unexpectedly closed (26 bytes received so far) [sender] rsync error: error in rsync protocol data stream (code 12) at io.c(454) [sender=2.6.9]

1 0

autobuild: pd-main macosx104-powerpc 2007-08-19 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 19 Aug '07

19 Aug '07

_regcomp referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regexec referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regfree referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _shutdown referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _sleep referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _socket referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _strcspn referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _task_get_special_port referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_terminate referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _vsnprintf referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _write referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _AudioConvertNanosToHostTime referenced from Jack expected to be defined in /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio _pthread_create referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_info referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_policy_set referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//ccAC1b9E.out (No such file or directory) make[2]: *** [../bin/pd] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

autobuild: pd-main macosx104-i386 2007-08-19 03.15.11
by pd＠macosx104-i386.idmi.poly.edu 19 Aug '07

19 Aug '07

lipo: can't figure out the architecture type of: /var/tmp//ccSKM58f.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: [pd] Error 2 (ignored) make -C /Users/pd/auto-build/pd-main/pd/src BUILDLAYOUT_DIR=/Users/pd/auto-build/pd-main/packages cvs_root_dir=/Users/pd/auto-build/pd-main DESTDIR=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test06.app/Contents/Resources prefix= libpddir=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test06.app/Contents/Resources OPT_CFLAGS="-march=pentium4 -msse2 -mfpmath=sse -ftree-vectorize -ftree-vectorizer-verbose=2" UNAME=Darwin install cd ../obj; cc -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -arch i386 -arch ppc -weak_framework Jack -o ../bin/pd g_canvas.o g_graph.o g_text.o g_rtext.o g_array.o g_template.o g_io.o g_scalar.o g_traversal.o g_guiconnect.o g_readwrite.o g_editor.o g_all_guis.o g_bang.o g_hdial.o g_hslider.o g_mycanvas.o g_numbox.o g_toggle.o g_vdial.o g_vslider.o g_vumeter.o m_pd.o m_class.o m_obj.o m_atom.o m_memory.o m_binbuf.o m_conf.o m_glob.o m_sched.o s_main.o s_inter.o s_file.o s_print.o s_loader.o s_path.o s_entry.o s_audio.o s_midi.o d_ugen.o d_ctl.o d_arithmetic.o d_osc.o d_filter.o d_dac.o d_misc.o d_math.o d_fft.o d_array.o d_global.o d_delay.o d_resample.o x_arithmetic.o x_connective.o x_interface.o x_midi.o x_misc.o x_time.o x_acoustics.o x_net.o x_qlist.o x_gui.o x_list.o d_soundfile.o s_midi_pm.o s_audio_pa.o s_audio_pablio.o s_audio_paring.o ../portaudio/src/common/pa_allocation.o ../portaudio/src/common/pa_converters.o ../portaudio/src/common/pa_cpuload.o ../portaudio/src/common/pa_dither.o ../portaudio/src/common/pa_front.o ../portaudio/src/common/pa_process.o ../portaudio/src/common/pa_skeleton.o ../portaudio/src/common/pa_stream.o ../portaudio/src/common/pa_trace.o ../portaudio/src/common/pa_debugprint.o ../portaudio/src/common/pa_ringbuffer.o ../portaudio/src/os/unix/pa_unix_util.o ../portaudio/src/os/mac_osx/pa_mac_hostapis.o ../portaudio/src/hostapi/coreaudio/pa_mac_core.o ../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.o ../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.o ../portmidi/pm_mac/pmmac.o ../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_common/pmutil.o ../portmidi/pm_common/portmidi.o ../portmidi/porttime/ptmacosx_cf.o s_audio_jack.o d_fft_mayer.o d_fftroutine.o -ldl -lm -lpthread cd ../obj && cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/include -I../portaudio/src/common -I../portaudio/src/os/mac_osx/ -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -DNEWBUFFER -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -dynamiclib -read_only_relocs warning \ -o ../bin/libPdTcl.dylib t_main.o t_tkcmd.o \ -F/Library/Frameworks \ -framework Tcl -framework Tk -framework System \ -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib ld: Undefined symbols: _Tcl_CreateCommand _Tcl_CreateFileHandler _Tcl_Eval _Tcl_GetVar /usr/bin/libtool: internal link edit command failed lipo: can't figure out the architecture type of: /var/tmp//ccZx4Qcf.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src builtins.c,1.1.2.62,1.1.2.63
by chunlee 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22194 Modified Files: Tag: desiredata builtins.c Log Message: display Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.62 retrieving revision 1.1.2.63 diff -C2 -d -r1.1.2.62 -r1.1.2.63 *** builtins.c 17 Aug 2007 04:44:33 -0000 1.1.2.62 --- builtins.c 19 Aug 2007 07:28:19 -0000 1.1.2.63 *************** *** 1041,1044 **** --- 1041,1066 ---- } + /*---- Display ----*/ + static t_class *display_class; + struct t_display : t_object { + }; + + static void *display_new(t_symbol *s) { + t_display *x = (t_display *)pd_new(display_class); + return x; + } + + static void display_send(t_display *x, t_symbol *s, int argc, t_atom *argv) { + std::ostringstream t; + t << s->name; + for (int i=0; i<argc; i++) {t << " " << &argv[i];} + sys_mgui(x, "dis", "S", t.str().data()); + } + static void display_setup() { + t_class *c = display_class = class_new2("display",display_new,0,sizeof(t_display),0,"S"); + class_addanything(c, display_send); + } + + /* MSW and OSX don't appear to have single-precision ANSI math */ #if defined(MSW) || defined(__APPLE__) *************** *** 2925,2928 **** --- 2947,2951 ---- print_setup(); macro_setup(); + display_setup(); clipboard_setup(); delay_setup();

1 0

pd/src kernel.c,1.1.2.89,1.1.2.90
by Mathieu Bouchard 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14107 Modified Files: Tag: desiredata kernel.c Log Message: disable profiler for real now Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.89 retrieving revision 1.1.2.90 diff -C2 -d -r1.1.2.89 -r1.1.2.90 *** kernel.c 18 Aug 2007 18:12:43 -0000 1.1.2.89 --- kernel.c 19 Aug 2007 07:06:27 -0000 1.1.2.90 *************** *** 387,396 **** static inline uint64 rdtsc() {uint64 x; __asm__ volatile (".byte 0x0f, 0x31":"=A"(x)); return x;} ! #if 0 ! #define ENTER_PROF ! #define LEAVE_PROF ! #else #define ENTER_PROF uint64 t = rdtsc(); #define LEAVE_PROF if (x->_class->gobj && ((t_gobj *)x)->dix) ((t_gobj *)x)->dix->elapsed += rdtsc() - t; #endif --- 387,397 ---- static inline uint64 rdtsc() {uint64 x; __asm__ volatile (".byte 0x0f, 0x31":"=A"(x)); return x;} ! //#define PROFILER ! #ifdef PROFILER #define ENTER_PROF uint64 t = rdtsc(); #define LEAVE_PROF if (x->_class->gobj && ((t_gobj *)x)->dix) ((t_gobj *)x)->dix->elapsed += rdtsc() - t; + #else + #define ENTER_PROF + #define LEAVE_PROF #endif

1 0

pd/src desire.c,1.1.2.217.2.230,1.1.2.217.2.231
by Mathieu Bouchard 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2438 Modified Files: Tag: desiredata desire.c Log Message: fix previous commit Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.230 retrieving revision 1.1.2.217.2.231 diff -C2 -d -r1.1.2.217.2.230 -r1.1.2.217.2.231 *** desire.c 19 Aug 2007 04:44:30 -0000 1.1.2.217.2.230 --- desire.c 19 Aug 2007 05:04:01 -0000 1.1.2.217.2.231 *************** *** 790,797 **** } ! /* When you ask a canvas its size the result is 2 pixels more than what ! you gave it to open it; perhaps there's a 1-pixel border all around it ! or something. Anyway, we just add the 2 pixels back here; seems we ! have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW #define HORIZBORDER 0 --- 790,796 ---- } ! /* When you ask a canvas its size the result is 2 pixels more than what you gave it to open it; ! perhaps there's a 1-pixel border all around it or something. Anyway, we just add the 2 pixels back here; ! seems we have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW #define HORIZBORDER 0 *************** *** 6511,6519 **** static void cnv_get_pos(t_cnv *x) { ! if(x->snd && x->snd->thing) { ! x->at[0].a_float = text_xpix(x, x->canvas); ! x->at[1].a_float = text_ypix(x, x->canvas); ! pd_list(x->snd->thing, &s_list, 2, x->at); ! } } --- 6510,6515 ---- static void cnv_get_pos(t_cnv *x) { ! error("unimplemented (TODO)"); ! // if(x->snd && x->snd->thing) {x->at[0].a_float = x; x->at[1].a_float = y; pd_list(x->snd->thing, &s_list, 2, x->at);} } *************** *** 6966,6977 **** class_sethelpsymbol(c, gensym("vu")); - c = dropper_class = class_new2("dropper",dropper_new,iemgui_free,sizeof(t_dropper),0,"*"); - iemgui_subclass(c); - class_addbang(c, dropper_bang); - class_addsymbol(c, dropper_symbol); - class_addmethod2(c,dropper_reload,"reload","*"); - class_setsavefn(c, (t_savefn)dropper_savefn); - class_sethelpsymbol(c, gensym("dropper")); - visualloader_class = class_new2("#V",visualloader_new,visualloader_free,sizeof(t_object),CLASS_GOBJ,"*"); class_addanything(visualloader_class,visualloader_anything); --- 6962,6965 ----

1 0

pd/src desire.c,1.1.2.217.2.229,1.1.2.217.2.230
by Mathieu Bouchard 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28093 Modified Files: Tag: desiredata desire.c Log Message: remove [dropper] (will be replaced by something else later) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.229 retrieving revision 1.1.2.217.2.230 diff -C2 -d -r1.1.2.217.2.229 -r1.1.2.217.2.230 *** desire.c 19 Aug 2007 04:37:52 -0000 1.1.2.217.2.229 --- desire.c 19 Aug 2007 04:44:30 -0000 1.1.2.217.2.230 *************** *** 3,11 **** This file is part of DesireData. Copyright (c) 2004-2007 by Mathieu Bouchard. - Copyright (c) 1997-2005 Miller Puckette. Portions Copyright (c) 1997-2005 Miller Puckette, Günter Geiger, Krzysztof Czaja, Johannes Zmoelnig, Thomas Musil, Joseph Sarlo, etc. The remains of IEMGUI Copyright (c) 2000-2001 Thomas Musil (IEM KUG Graz Austria) - [dropper] class is Copyright (c) 2004 Carmen Rocco For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "LICENSE.txt," in this distribution. --- 3,9 ---- *************** *** 6569,6611 **** } - static t_class *dropper_class; - - static void dropper_bang(t_dropper *x) { - outlet_symbol(x->outlet, x->ds); - if(x->snd && x->snd->thing) pd_symbol(x->snd->thing, x->ds); - } - - static void dropper_symbol(t_dropper *x, t_symbol *s) { - SET(ds,s); - dropper_bang(x); - } - - static int dropper_pickle(t_dropper *x, t_foo *foo) { - return pd_pickle(foo,"iiaaaiiiiccc",&x->w,&x->isa,&x->snd,&x->rcv,&x->lab, - &x->ldx,&x->ldy,&x->font_style,&x->fontsize,&x->bcol,&x->fcol,&x->lcol); - } - - static void dropper_savefn(t_dropper *x, t_binbuf *b) { - t_foo foo = {0,0,b}; if (!b) return; - pd_savehead(b,x,"dropper"); dropper_pickle(x,&foo); - } - - static void dropper_reload(t_dropper *x, t_symbol *s, int argc, t_atom *argv) { - t_foo foo = { argc, argv, 0 }; - binbuf_update(x,gensym("dropper"),argc,argv); - if (!dropper_pickle(x,&foo)) return; - SET(h,x->w); - if (x->rcv) pd_bind(x,x->rcv); - iemgui_constrain(x); - gobj_changed(x,0); - } - - static void *dropper_new(t_symbol *s, int argc, t_atom *argv) { - t_dropper *x = (t_dropper *) iemgui_new(dropper_class); - outlet_new(x, &s_symbol); - dropper_reload(x,0,argc,argv); - return x; - } - void canvas_notice(t_gobj *x, t_gobj *origin, int argc, t_atom *argv) { t_canvas *self = (t_canvas *)x; --- 6567,6570 ----

1 0

pd/src desire.c, 1.1.2.217.2.228, 1.1.2.217.2.229 desire.h, 1.1.2.49.2.52, 1.1.2.49.2.53
by Mathieu Bouchard 19 Aug '07

19 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25620 Modified Files: Tag: desiredata desire.c desire.h Log Message: linked-list of havewindow canvases is replaced by std::map Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.52 retrieving revision 1.1.2.49.2.53 diff -C2 -d -r1.1.2.49.2.52 -r1.1.2.49.2.53 *** desire.h 19 Aug 2007 02:35:27 -0000 1.1.2.49.2.52 --- desire.h 19 Aug 2007 04:37:55 -0000 1.1.2.49.2.53 *************** *** 165,169 **** t_symbol *name; /* symbol bound here */ int font; /* nominal font size in points, e.g., 10 */ - t_canvas *gl_next; /* link in list of toplevels */ t_canvasenvironment *env; /* one of these per $0; env=0 for subpatches */ unsigned int havewindow:1; /* this indicates whether we publish to the manager */ --- 165,168 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.228 retrieving revision 1.1.2.217.2.229 diff -C2 -d -r1.1.2.217.2.228 -r1.1.2.217.2.229 *** desire.c 19 Aug 2007 02:35:24 -0000 1.1.2.217.2.228 --- desire.c 19 Aug 2007 04:37:52 -0000 1.1.2.217.2.229 *************** *** 43,49 **** */ #define boxes_each(CHILD,BOXES) for(t_gobj *CHILD=(BOXES)->first(); CHILD; CHILD=CHILD->next()) #define canvas_each(CHILD,CANVAS) for(t_gobj *CHILD=(CANVAS)->boxes->first(); CHILD; CHILD=CHILD->next()) - #define canvases_each(CANVAS) for(t_canvas *CANVAS=canvas_list; CANVAS; CANVAS=CANVAS->gl_next) #define canvas_wires_each(WIRE,TRAV,CANVAS) \ for (t_outconnect *WIRE=(t_outconnect *)666; WIRE==(t_outconnect *)666; ) \ --- 43,50 ---- */ + #define foreach(ITER,COLL) for(typeof(COLL.begin()) ITER = COLL.begin(); ITER != (COLL).end(); ITER++) + #define boxes_each(CHILD,BOXES) for(t_gobj *CHILD=(BOXES)->first(); CHILD; CHILD=CHILD->next()) #define canvas_each(CHILD,CANVAS) for(t_gobj *CHILD=(CANVAS)->boxes->first(); CHILD; CHILD=CHILD->next()) #define canvas_wires_each(WIRE,TRAV,CANVAS) \ for (t_outconnect *WIRE=(t_outconnect *)666; WIRE==(t_outconnect *)666; ) \ *************** *** 417,421 **** int canvas_dspstate; /* whether DSP is on or off */ t_canvas *canvas_whichfind; /* last canvas we did a find in */ ! t_canvas *canvas_list; /* list of all root canvases */ static void canvas_setbounds(t_canvas *x, t_floatarg x1, t_floatarg y1, t_floatarg x2, t_floatarg y2); static t_symbol *canvas_newfilename = &s_; --- 418,422 ---- int canvas_dspstate; /* whether DSP is on or off */ t_canvas *canvas_whichfind; /* last canvas we did a find in */ ! std::map<t_canvas *,int> windowed_canvases; /* where int is dummy */ static void canvas_setbounds(t_canvas *x, t_floatarg x1, t_floatarg y1, t_floatarg x2, t_floatarg y2); static t_symbol *canvas_newfilename = &s_; *************** *** 425,442 **** /* add a canvas the list of "root" canvases (toplevels without parents.) */ static void canvas_addtolist(t_canvas *x) { ! x->gl_next = canvas_list; ! canvas_list = x; if (x->havewindow) gobj_subscribe(x,manager); } ! ! static void canvas_takeofflist(t_canvas *x) { ! if (x == canvas_list) canvas_list = x->gl_next; ! else { ! t_canvas *z; ! for (z = canvas_list; z->gl_next != x; z = z->gl_next) {} ! z->gl_next = x->gl_next; ! } ! } /* if there's an old one lying around free it here. --- 426,435 ---- /* add a canvas the list of "root" canvases (toplevels without parents.) */ + /* should those two functions still exist? */ static void canvas_addtolist(t_canvas *x) { ! windowed_canvases.insert(std::pair<t_canvas *,int>(x,42)); if (x->havewindow) gobj_subscribe(x,manager); } ! static void canvas_takeofflist(t_canvas *x) {windowed_canvases.erase(x);} /* if there's an old one lying around free it here. *************** *** 938,942 **** ugen_start(); //timeval v0,v1; gettimeofday(&v0,0); ! canvases_each(x) canvas_dodsp(x,1,0); //gettimeofday(&v1,0); printf("canvas_start_dsp took %ld us\n",(v1.tv_sec-v0.tv_sec)*1000000+(v1.tv_usec-v0.tv_usec)); canvas_dspstate = 1; --- 931,935 ---- ugen_start(); //timeval v0,v1; gettimeofday(&v0,0); ! foreach(x,windowed_canvases) canvas_dodsp(x->first,1,0); //gettimeofday(&v1,0); printf("canvas_start_dsp took %ld us\n",(v1.tv_sec-v0.tv_sec)*1000000+(v1.tv_usec-v0.tv_usec)); canvas_dspstate = 1; *************** *** 1094,1098 **** void canvas_reload(t_symbol *name, t_symbol *dir, t_gobj *except) { ! canvases_each(x) canvas_doreload(x, name, dir, except); } --- 1087,1091 ---- void canvas_reload(t_symbol *name, t_symbol *dir, t_gobj *except) { ! foreach(x,windowed_canvases) canvas_doreload(x->first, name, dir, except); } *************** *** 1178,1182 **** void canvas_finderror(void *error_object) { ! canvases_each(x) if (canvas_dofinderror(x, error_object)) return; post("... sorry, I couldn't find the source of that error."); } --- 1171,1175 ---- void canvas_finderror(void *error_object) { ! foreach(x,windowed_canvases) if (canvas_dofinderror(x->first, error_object)) return; post("... sorry, I couldn't find the source of that error."); } *************** *** 3657,3661 **** post("conforming template '%s' to new structure", tfrom->sym->name); for (int i=0; i<nto; i++) post("... %d", conformaction[i]); ! canvases_each(gl) template_conformcanvas(tfrom, tto, conformaction, gl); } free(conformaction); --- 3650,3654 ---- post("conforming template '%s' to new structure", tfrom->sym->name); for (int i=0; i<nto; i++) post("... %d", conformaction[i]); ! foreach(gl,windowed_canvases) template_conformcanvas(tfrom, tto, conformaction, gl->first); } free(conformaction); *************** *** 7325,7333 **** /* properly close all open root canvases */ extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { ! t_canvas *y; ! for (t_canvas *x = canvas_list; x; x=y) { ! y = x->gl_next; ! canvas_close(x); /* forced closing of this root canvas */ ! } } --- 7318,7322 ---- /* properly close all open root canvases */ extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { ! foreach(x,windowed_canvases) canvas_close(x->first); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
62
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 August 2007