Pd-cvs December 2005

pd-cvs@lists.iem.at

13 participants
490 discussions

pd/src objective.tcl,1.1.2.4,1.1.2.5
by Mathieu Bouchard 05 Dec '05

05 Dec '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7612 Modified Files: Tag: devel_0_39 objective.tcl Log Message: uhoh Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** objective.tcl 2 Nov 2005 11:49:05 -0000 1.1.2.4 --- objective.tcl 5 Dec 2005 01:08:11 -0000 1.1.2.5 *************** *** 12,19 **** --- 12,46 ---- # note, the toplevel class is called "thing". + if {$tcl_version < 8.5} {source pre8.5.tcl} set nextid 0 set _(class:_class) class set _(class:_super) {thing} + proc proc* {name args body} { + set argl {} + foreach arg $args {set arg [lindex $arg 0]; lappend argl "$arg=\$$arg"} + proc $name $args "puts \"CALL TO PROC $name [join $argl " "]\"; $body" + } + + #proc class_def {self selector args body} { + # global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} + # proc ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" + #} + #proc class_def* {self selector args body} { + # global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} + # proc* ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" + #} + #proc def {class selector args body} {$class def $selector $args $body} + #proc def* {class selector args body} {$class def* $selector $args $body} + + proc def {self selector args body} { + global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} + proc ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" + } + proc def* {self selector args body} { + global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} + proc* ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" + } + proc class_new {self {super {thing}}} { global _ *************** *** 37,60 **** } - proc proc* {name args body} { - set argl {} - foreach arg $args {set arg [lindex $arg 0]; lappend argl "$arg=\$$arg"} - proc $name $args "puts \"CALL TO PROC $name [join $argl " "]\"; $body" - } - - proc def {class selector args body} { - global _ - if {![info exists _($class:_class)]} {error "unknown class '$class'"} - proc ${class}_$selector "self $args" \ - "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" - } - - proc def* {class selector args body} { - global _ - if {![info exists _($class:_class)]} {error "unknown class '$class'"} - proc* ${class}_$selector "self $args" \ - "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" - } - proc lookup_method {class selector methodsv ancestorsv} { global _ --- 64,67 ---- *************** *** 106,107 **** --- 113,115 ---- def* thing _delete {} {} + #-----------------------------------------------------------------------------------#

1 0

pd/src SConscript,1.1.4.39,1.1.4.40
by Thomas Grill 05 Dec '05

05 Dec '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197/src Modified Files: Tag: devel_0_39 SConscript Log Message: updated for newer portmidi distributions (OSX) Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.39 retrieving revision 1.1.4.40 diff -C2 -d -r1.1.4.39 -r1.1.4.40 *** SConscript 4 Dec 2005 21:54:08 -0000 1.1.4.39 --- SConscript 5 Dec 2005 00:45:43 -0000 1.1.4.40 *************** *** 419,427 **** pm_osx_sources = map(lambda x: pmpath+x, Split(""" ! /pmdarwin.c ! /pmmacosx.c ! /pmutil.c ! /portmidi.c ! /ptdarwin.c """) ) --- 419,428 ---- pm_osx_sources = map(lambda x: pmpath+x, Split(""" ! /pm_mac/pmmac.c ! /pm_mac/pmmacosxcm.c ! /pm_common/pmutil.c ! /pm_common/portmidi.c ! /porttime/porttime.c ! /porttime/ptmacosx_cf.c """) ) *************** *** 438,442 **** sources.append(osx_sources) ! pdenv.Append(CPPPATH=pmpath) pdenv.Append(CPPDEFINES=osx_defs) --- 439,443 ---- sources.append(osx_sources) ! pdenv.Append(CPPPATH=pmpath+"/pm_mac") pdenv.Append(CPPDEFINES=osx_defs) *************** *** 463,467 **** --- 464,473 ---- pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pablio']) + ###################################################################### + # + # portmidi stuff + if pdenv['portmidipath']: + pdenv.Append(CPPPATH=[pmpath+'/pm_common',pmpath+'/porttime']) ######################################################################

1 0

pd/src SConscript,1.1.4.38,1.1.4.39
by Tim Blechmann 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22120/src Modified Files: Tag: devel_0_39 SConscript Log Message: fixing bugs introduced by carmen Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.38 retrieving revision 1.1.4.39 diff -C2 -d -r1.1.4.38 -r1.1.4.39 *** SConscript 3 Dec 2005 06:40:36 -0000 1.1.4.38 --- SConscript 4 Dec 2005 21:54:08 -0000 1.1.4.39 *************** *** 62,72 **** d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c - g_rtext.c - m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c s_audio.c s_file.c s_inter.c s_loader.c ! s_main.c s_midi.c s_path.c x_acoustics.c x_arithmetic.c x_connective.c x_gui.c x_interface.c --- 62,70 ---- d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c s_audio.c s_file.c s_inter.c s_loader.c ! s_main.c s_midi.c s_path.c s_print.c x_acoustics.c x_arithmetic.c x_connective.c x_gui.c x_interface.c *************** *** 76,80 **** if pdenv['desire']: sources += Split(""" ! desire.c """) else: --- 74,78 ---- if pdenv['desire']: sources += Split(""" ! desire.c g_rtext.c """) else: *************** *** 82,90 **** g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_vdial.c g_vslider.c g_vumeter.c ! g_text.c g_toggle.c g_all_guis.c g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c - - s_print.c """) --- 80,86 ---- g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_vdial.c g_vslider.c g_vumeter.c ! g_text.c g_toggle.c g_rtext.c g_all_guis.c g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c """) *************** *** 139,144 **** Exit(1) ! pdenv.Append(CPPPATH=[path_pthread+'/include',path_tcl+'/include']) ! pdenv.Append(LIBPATH=[path_pthread+'/lib',path_tcl+'/lib']) pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc']) --- 135,140 ---- Exit(1) ! pdenv.Append(CPPPATH=[path_pthread,path_tcl+'/include']) ! pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib']) pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc']) *************** *** 147,151 **** sep = "" if 'msvc' in pdenv['TOOLS']: ! pthreadLib = "pthreadVC2" else: pthreadLib = "pthreadGC2" --- 143,147 ---- sep = "" if 'msvc' in pdenv['TOOLS']: ! pthreadLib = "pthreadVC" else: pthreadLib = "pthreadGC2" *************** *** 178,182 **** # ! add_cpppath = [pdenv['prefix']+'/include'] if pdenv['PLATFORM'] != 'win32': --- 174,178 ---- # ! add_cpppath = [] if pdenv['PLATFORM'] != 'win32': *************** *** 356,359 **** --- 352,356 ---- """) ) + pdenv.Append(LIBS="asiolib") if 'msvc' in pdenv['TOOLS']: *************** *** 390,396 **** if pdenv['portaudio']: ! linux_sources += pa_sources linux_defs.append("PA_USE_ALSA") - linux_libs.append('portaudio') if pdenv['simd']: --- 387,392 ---- if pdenv['portaudio']: ! linux_sources += pa_sources + pa_common_sources + pa_linux_sources linux_defs.append("PA_USE_ALSA") if pdenv['simd']: *************** *** 479,483 **** if pdenv['wall']: cflags += " -Wall" - #cflags += " -Wall -ansi -pedantic" if pdenv['plusplus']: --- 475,478 ---- *************** *** 575,580 **** pdenv.Append(CCFLAGS=Split(flags)+Split(cflags)) ! pdenv.Append(CXXFLAGS=Split(flags)+Split(cflags)) ! pdenv.Append(LINKFLAGS=Split(flags)+Split(lflags)) --- 570,574 ---- pdenv.Append(CCFLAGS=Split(flags)+Split(cflags)) ! pdenv.Append(LINKFLAGS=Split(flags)+Split(lflags)+Split(cflags))

1 0

packages/patches build_vars_4_makefile.in.patch,1.4,1.5
by Hans-Christoph Steiner 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31299/patches Modified Files: build_vars_4_makefile.in.patch Log Message: make distclean now cleans up autoconf cruft, preventing this error: Can't locate object method "path" via package "Autom4te::Request" Index: build_vars_4_makefile.in.patch =================================================================== RCS file: /cvsroot/pure-data/packages/patches/build_vars_4_makefile.in.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build_vars_4_makefile.in.patch 2 Dec 2005 19:12:41 -0000 1.4 --- build_vars_4_makefile.in.patch 4 Dec 2005 19:53:58 -0000 1.5 *************** *** 5,9 **** diff -u -w -r1.5 makefile.in --- makefile.in 6 Nov 2004 16:07:33 -0000 1.5 ! +++ makefile.in 2 Dec 2005 15:46:04 -0000 @@ -5,10 +5,20 @@ EXT= @EXT@ --- 5,9 ---- diff -u -w -r1.5 makefile.in --- makefile.in 6 Nov 2004 16:07:33 -0000 1.5 ! +++ makefile.in 4 Dec 2005 19:45:18 -0000 @@ -5,10 +5,20 @@ EXT= @EXT@ *************** *** 92,96 **** local-clean: -rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! @@ -166,14 +185,14 @@ $(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies --- 92,112 ---- local-clean: -rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! @@ -154,11 +173,10 @@ ! clean: extra-clean local-clean ! ! distclean: clean ! - rm -rf config.cache config.log config.status makefile tags \ ! - autom4te-*.cache ! - echo all: > makefile ! - echo -e "\t./configure" >> makefile ! - echo -e "\tmake" >> makefile ! + -rm -f config.cache config.log config.status makefile configure tags \ ! + autom4te.cache/output.* autom4te.cache/traces.* autom4te.cache/requests ! + -rmdir autom4te.cache ! + -rm -rf autom4te-*.cache ! ! tags: $(SRC) $(GSRC); ctags *.[ch] ! ! @@ -166,14 +184,14 @@ $(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies

1 0

packages Makefile,1.18,1.19
by Hans-Christoph Steiner 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31299 Modified Files: Makefile Log Message: make distclean now cleans up autoconf cruft, preventing this error: Can't locate object method "path" via package "Autom4te::Request" Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile 2 Dec 2005 19:12:40 -0000 1.18 --- Makefile 4 Dec 2005 19:53:57 -0000 1.19 *************** *** 147,152 **** PD_BUILD_FLAGS = ! # Pd sometimes needs a specific autoconf, which is labeled differently on different ! # machines #PD_AUTOCONF := ${shell ( test -x "`which autoconf-2.59`" && echo autoconf-2.59 ) || echo autoconf } PD_AUTOCONF = autoconf --- 147,151 ---- PD_BUILD_FLAGS = ! # Pd needs autoconf 2.5x, which is labeled differently on different machines #PD_AUTOCONF := ${shell ( test -x "`which autoconf-2.59`" && echo autoconf-2.59 ) || echo autoconf } PD_AUTOCONF = autoconf *************** *** 521,525 **** #==============================================================================# ! devsymlinks: --- 520,585 ---- #==============================================================================# ! devsymlinks: devsymlinks_$(OS_NAME) ! ! ! ! devsymlinks_win: ! ! ! devsymlinks_linux: ! ! ! TCLTK_VERSION=8.4 ! devsymlinks_darwin: ! # this makes /usr/local symlinks to the Tcl/Tk frameworks so that ./configure ! # can find them. ! # headers ! test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tcl.h && \ ! ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tcl.h \ ! /usr/local/lib/tcl.h ! test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclDecls.h && \ ! ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclDecls.h \ ! /usr/local/lib/tclDecls.h ! test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclPlatDecls.h && \ ! ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Headers/tclPlatDecls.h \ ! /usr/local/lib/tclPlatDecls.h ! # libs ! test -e /Library/Frameworks/Tcl.framework/tclConfig.sh && \ ! ln -s /Library/Frameworks/Tcl.framework/tclConfig.sh /usr/local/lib ! test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Tcl && \ ! ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/Tcl \ ! /usr/local/lib/libtcl$(TCLTK_VERSION).dylib ! test -e /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/libtclstub$(TCLTK_VERSION).a && \ ! ln -s /Library/Frameworks/Tcl.framework/Versions/$(TCLTK_VERSION)/libtclstub$(TCLTK_VERSION).a \ ! /usr/local/lib/libtclstub$(TCLTK_VERSION).a ! test -e /usr/local/lib/libtcl$(TCLTK_VERSION).dylib && \ ! ln -s /usr/local/lib/libtcl$(TCLTK_VERSION).dylib /usr/local/lib/libtcl.dylib ! # headers ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tk.h && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tk.h \ ! /usr/local/lib/tk.h ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkDecls.h && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkDecls.h \ ! /usr/local/lib/tkDecls.h ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkIntXlibDecls.h && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkIntXlibDecls.h \ ! /usr/local/lib/tkIntXlibDecls.h ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkMacOSX.h && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkMacOSX.h \ ! /usr/local/lib/tkMacOSX.h ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkPlatDecls.h && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Headers/tkPlatDecls.h \ ! /usr/local/lib/tkPlatDecls.h ! # libs ! test -e /Library/Frameworks/Tk.framework/tkConfig.sh && \ ! ln -s /Library/Frameworks/Tk.framework/tkConfig.sh /usr/local/lib ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Tk && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/Tk \ ! /usr/local/lib/libtk$(TCLTK_VERSION).dylib ! test -e /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a && \ ! ln -s /Library/Frameworks/Tk.framework/Versions/$(TCLTK_VERSION)/libtkstub$(TCLTK_VERSION).a \ ! /usr/local/lib/libtkstub$(TCLTK_VERSION).a ! test -e /usr/local/lib/libtk$(TCLTK_VERSION).dylib && \ ! ln -s /usr/local/lib/libtk$(TCLTK_VERSION).dylib /usr/local/lib/libtk.dylib *************** *** 629,630 **** --- 689,691 ---- @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" +

1 0

abstractions/tb find_hid.py, NONE, 1.1 find_hid-help.pd, NONE, 1.1
by Tim Blechmann 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/abstractions/tb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9518 Added Files: find_hid.py find_hid-help.pd Log Message: find hid devices in udevfs --- NEW FILE: find_hid-help.pd --- #N canvas 0 0 450 300 10; #X obj 51 100 py find_hid find; #X obj 51 122 print; #X msg 51 65 reload; #X msg 158 69 find USB-PS/2 Optical Mouse; #X text 53 239 $Id: find_hid-help.pd 192 2005-11-20 00:54:05Z tim $; #X text 49 153 find device in linux udevfs; #X connect 0 0 1 0; #X connect 2 0 0 0; #X connect 3 0 0 1; --- NEW FILE: find_hid.py --- # Python script to search the udev file system for devices # Copyright (C) 2005 Tim Blechmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # # $Id: find_hid.py,v 1.1 2005/12/04 18:11:08 timblech Exp $ # from os import popen, listdir def find (*args): name = "" for token in args: name+=" " + str(token) name = name.strip() events = filter(lambda x: "event" in x, listdir('/sys/class/input/')) for event in events: pipe = popen('udevinfo -a -p /sys/class/input/%s' % event) line = pipe.readline() while line: if name in line: print event return float(event.strip("event")) line = pipe.readline() pipe.close() return -1

1 0

pd/src desire.tk,1.1.2.136,1.1.2.137
by Mathieu Bouchard 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25384 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed [hsl], [vsl] draw Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.136 retrieving revision 1.1.2.137 diff -C2 -d -r1.1.2.136 -r1.1.2.137 *** desire.tk 4 Dec 2005 12:58:54 -0000 1.1.2.136 --- desire.tk 4 Dec 2005 16:58:16 -0000 1.1.2.137 *************** *** 2424,2428 **** } ! class_new slider {view} def slider orient {} { switch $@class { --- 2424,2428 ---- } ! class_new slider {bluebox} def slider orient {} { switch $@class { *************** *** 2433,2436 **** --- 2433,2437 ---- def* slider init {args} { + super set @clicking 0 } *************** *** 2447,2454 **** set outs [expr [string compare $@snd empty]==0] super set color [bluify #ffffff] ! $self item KNOB rectangle $x1 $y1 $x1 $y1 \ -outline #000000 -fill [darker $color] ! set {u1 v1 u2 v2} [$@canvas coords ${self}BASE] set span [expr $@max-$@min] set l [expr $orient?$@h:$@w] --- 2448,2456 ---- set outs [expr [string compare $@snd empty]==0] super + $self makebox $x1 $y1 $@w $@h $@ninlets $@noutlets set color [bluify #ffffff] ! $self item KNOB rectangle [list $x1 $y1 $x1 $y1] \ -outline #000000 -fill [darker $color] ! set c .$(a)canvas.c set span [expr $@max-$@min] set l [expr $orient?$@h:$@w] *************** *** 2456,2469 **** set @value $value if {$orient} { ! set size [expr $u2-$x1] ! set y1 [expr $v2-$value*($l-1)/$span-2] set y2 [expr $y1-2] ! $@canvas coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2 } { ! set size [expr $v2-$y1] set x1 [expr $x1+$value*($l-1)/$span] set x2 [expr $x1+2] set y2 [expr $y1+$size] ! $@canvas coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2] } } --- 2458,2471 ---- set @value $value if {$orient} { ! set size $xs ! set y1 [expr $y1+$ys-$value*($l-1)/$span-2] set y2 [expr $y1-2] ! $c coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2 } { ! set size $ys set x1 [expr $x1+$value*($l-1)/$span] set x2 [expr $x1+2] set y2 [expr $y1+$size] ! $c coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2] } }

1 0

pd/src desire.tk,1.1.2.135,1.1.2.136
by Mathieu Bouchard 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9872 Modified Files: Tag: devel_0_39 desire.tk Log Message: [nbx] now renders Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.135 retrieving revision 1.1.2.136 diff -C2 -d -r1.1.2.135 -r1.1.2.136 *** desire.tk 4 Dec 2005 12:14:40 -0000 1.1.2.135 --- desire.tk 4 Dec 2005 12:58:54 -0000 1.1.2.136 *************** *** 725,729 **** } ! def view item_delete {} {.$(a)canvas.c delete $self} def* view delete {} {$self erase; $self _delete; io_erase $self} def* view erase {} {$self item_delete} --- 725,733 ---- } ! def view item_delete {{suffix all}} { ! switch -- $suffix { ! all {.$(a)canvas.c delete $self } ! default {.$(a)canvas.c delete $self$suffix}}} ! def* view delete {} {$self erase; $self _delete; io_erase $self} def* view erase {} {$self item_delete} *************** *** 969,972 **** --- 973,977 ---- def* canvas noutlets= {n} {} def canvas focus {} {return $@focus} + def canvas focus= {o} {set @focus $o} *************** *** 1177,1187 **** global look set nplus [expr $n==1 ? 1 : $n-1] ! mset {x1 y1} [$self xy] set c .$(a)canvas.c for {set i 0} {$i<$n} {incr i} { ! set onset [expr $x1 + ($@xs-$look(iowidth)) * $i / $nplus] set points [list [expr $onset] $y [expr $onset+$look(iowidth)] [expr $y+1]] # will update this code when proc item deals with mult.tags ! if {[llength [$c gettags ${self}$which$i]] != 0} { $c coords ${self}$which$i $points } { --- 1182,1195 ---- global look set nplus [expr $n==1 ? 1 : $n-1] ! #mset {x1 y1} [$self xy] ! mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}BASE] ! set xs [expr $x2-$x1] ! set ys [expr $y2-$y1] set c .$(a)canvas.c for {set i 0} {$i<$n} {incr i} { ! set onset [expr $x1 + ($xs-$look(iowidth)) * $i / $nplus] set points [list [expr $onset] $y [expr $onset+$look(iowidth)] [expr $y+1]] # will update this code when proc item deals with mult.tags ! if {[llength [$c gettags $self$which$i]] != 0} { $c coords ${self}$which$i $points } { *************** *** 1195,1201 **** global look set fy $look(iopos) ! mset {x1 y1} [$self xy] io_draw/2 $self i $@ninlets [expr $y1-$fy-1] ! io_draw/2 $self o $@noutlets [expr $y1+$fy+$@ys] } --- 1203,1210 ---- global look set fy $look(iopos) ! #mset {x1 y1} [$self xy] ! mset {x1 y1 x2 y2} [.$(a)canvas.c bbox ${self}BASE] io_draw/2 $self i $@ninlets [expr $y1-$fy-1] ! io_draw/2 $self o $@noutlets [expr $y2+$fy] } *************** *** 2251,2254 **** --- 2260,2265 ---- } + def thing == {other} {return [expr ![string compare $self $other]]} + def numbox draw {} { global look *************** *** 2265,2274 **** set yt [expr $y1+$ys/2+1+$xs/34] set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2] ! set focused [expr ![string compare $self [canvas_focuser $@canvas]]] if {$focused} {set color4 #00ff00} {set color4 $look(objectbg)} $self item BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) $self item BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) ! $self item NUMBER text $xt $yt -anchor w -text [numbox_ftoa $self] -font [list $font $@fs bold] -fill [parse_color $@fcol] ! $@canvas delete ${self}CURS if {[string length $@buf]>0} { mset {blah blah x3 blah} [$@canvas bbox ${self}NUMBER] --- 2276,2286 ---- set yt [expr $y1+$ys/2+1+$xs/34] set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2] ! set focused [$self == [$@canvas focus]] if {$focused} {set color4 #00ff00} {set color4 $look(objectbg)} $self item BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) $self item BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) ! $self item NUMBER text [list $xt $yt] -anchor w -text [numbox_ftoa $self] \ ! -font [list $font $@fs bold] -fill [parse_color $@fcol] ! .$(a)canvas.c delete ${self}CURS if {[string length $@buf]>0} { mset {blah blah x3 blah} [$@canvas bbox ${self}NUMBER] *************** *** 2276,2282 **** } io_draw $self ! label_draw $self if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} ! $@canvas itemconfigure ${self}BASE -outline $frcol } --- 2288,2294 ---- } io_draw $self ! labeled_draw $self if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} ! .$(a)canvas.c itemconfigure ${self}BASE -outline $frcol } *************** *** 2312,2316 **** def numbox motion {x y mod} { ! set focused [expr ![string compare $self [canvas_focuser $@canvas]]] if {!$focused} {return} mset {ox oy} $@mouse --- 2324,2328 ---- def numbox motion {x y mod} { ! set focused [$self == [$@canvas focus]] if {!$focused} {return} mset {ox oy} $@mouse *************** *** 2429,2443 **** set xs $@w set ys $@h ! set orient [slider_orient $self] if {$orient} {set y1 [expr $y1-2]} {set x1 [expr $x1-2]} if {$orient} {set ys [expr $ys+5]} {set xs [expr $xs+5]} set ins [expr [string compare $@rcv empty]==0] set outs [expr [string compare $@snd empty]==0] - switch $@class {hsl {set orient 0} vsl {set orient 1}} super set color [bluify #ffffff] $self item KNOB rectangle $x1 $y1 $x1 $y1 \ -outline #000000 -fill [darker $color] ! set pos [$@canvas coords ${self}BASE] set span [expr $@max-$@min] set l [expr $orient?$@h:$@w] --- 2441,2454 ---- set xs $@w set ys $@h ! set orient [$self orient] if {$orient} {set y1 [expr $y1-2]} {set x1 [expr $x1-2]} if {$orient} {set ys [expr $ys+5]} {set xs [expr $xs+5]} set ins [expr [string compare $@rcv empty]==0] set outs [expr [string compare $@snd empty]==0] super set color [bluify #ffffff] $self item KNOB rectangle $x1 $y1 $x1 $y1 \ -outline #000000 -fill [darker $color] ! set {u1 v1 u2 v2} [$@canvas coords ${self}BASE] set span [expr $@max-$@min] set l [expr $orient?$@h:$@w] *************** *** 2445,2460 **** set @value $value if {$orient} { ! set size [expr [lindex $pos 2]-$x1] ! set y1 [expr [lindex $pos 3]-$value*($l-1)/$span-2] set y2 [expr $y1-2] ! $@canvas coords ${self}KNOB \ ! [expr $x1+2] $y1 [expr $x1+$size-2] $y2 } { ! set size [expr [lindex $pos 3]-$y1] set x1 [expr $x1+$value*($l-1)/$span] set x2 [expr $x1+2] set y2 [expr $y1+$size] ! $@canvas coords ${self}KNOB \ ! $x1 [expr $y1+2] $x2 [expr $y1+$size-2] } } --- 2456,2469 ---- set @value $value if {$orient} { ! set size [expr $u2-$x1] ! set y1 [expr $v2-$value*($l-1)/$span-2] set y2 [expr $y1-2] ! $@canvas coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2 } { ! set size [expr $v2-$y1] set x1 [expr $x1+$value*($l-1)/$span] set x2 [expr $x1+2] set y2 [expr $y1+$size] ! $@canvas coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2] } } *************** *** 2462,2465 **** --- 2471,2475 ---- # not used def slider draw_notches {} { + set orient [$self orient] if {$orient} { set thick [clamp [expr $xs/3] 1 5] *************** *** 2493,2497 **** def slider motion {x y mods} { ! set focused [expr ![string compare $self [canvas_focuser $@canvas]]] if {!$focused} {return} set dx [expr $x-[lindex $@first 0]] --- 2503,2507 ---- def slider motion {x y mods} { ! set focused [$self == [$@canvas focus]] if {!$focused} {return} set dx [expr $x-[lindex $@first 0]] *************** *** 2518,2523 **** $@fs bold] set lcolor [parse_color $@lcol] ! $self item LABEL text $lx $ly -text $label -anchor w \ ! -font $lfont -fill $lcolor } --- 2528,2532 ---- $@fs bold] set lcolor [parse_color $@lcol] ! $self item LABEL text [list $lx $ly] -text $label -anchor w -font $lfont -fill $lcolor }

1 0

externals/zexy/src fifop.c,1.7,1.8 lifop.c,1.5,1.6
by IOhannes m zmölnig 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9676 Modified Files: fifop.c lifop.c Log Message: simplified the stack counter Index: fifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/fifop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fifop.c 4 Dec 2005 12:44:33 -0000 1.7 --- fifop.c 4 Dec 2005 12:58:29 -0000 1.8 *************** *** 45,49 **** t_fifop_list *fifo_end; struct _fifop_prioritylist *next; - unsigned long counter; } t_fifop_prioritylist; --- 45,48 ---- *************** *** 53,56 **** --- 52,56 ---- t_fifop_prioritylist *fifo_list; t_float priority; /* current priority */ + unsigned long counter; t_outlet *x_out, *x_infout; } t_fifop; *************** *** 84,88 **** result->fifo_end=0; result->next=0; - result->counter=0; /* insert it into the list of priority lists */ --- 84,87 ---- *************** *** 140,144 **** fifoprio->fifo_end =entry; } - fifoprio->counter++; return 0; } --- 139,142 ---- *************** *** 158,162 **** return; } ! add2fifo(pfifo, argc, argv); } static void fifop_bang(t_fifop *x) --- 156,163 ---- return; } ! if(!add2fifo(pfifo, argc, argv)) ! { ! x->counter++; ! } } static void fifop_bang(t_fifop *x) *************** *** 176,180 **** } ! pfifo->counter--; pfifo->fifo_start=fifo->next; --- 177,181 ---- } ! x->counter--; pfifo->fifo_start=fifo->next; *************** *** 201,215 **** static void fifop_query(t_fifop*x) { ! unsigned long counter=0; ! t_fifop_prioritylist*pfifo=x->fifo_list; ! ! while(pfifo!=NULL){ ! counter+=pfifo->counter; ! pfifo=pfifo->next; ! } ! ! verbose(1, "%d elements in fifo", (int)counter); ! outlet_float(x->x_infout, (t_float)counter); } static void fifop_free(t_fifop *x) --- 202,208 ---- static void fifop_query(t_fifop*x) { ! verbose(1, "%d elements in fifo", (int)x->counter); ! outlet_float(x->x_infout, (t_float)x->counter); } static void fifop_free(t_fifop *x) Index: lifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lifop.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lifop.c 4 Dec 2005 12:44:33 -0000 1.5 --- lifop.c 4 Dec 2005 12:58:29 -0000 1.6 *************** *** 44,48 **** t_lifop_list *lifo_start; struct _lifop_prioritylist *next; - unsigned long counter; } t_lifop_prioritylist; typedef struct _lifop --- 44,47 ---- *************** *** 50,53 **** --- 49,53 ---- t_object x_obj; t_lifop_prioritylist *lifo_list; + unsigned long counter; t_float priority; /* current priority */ t_outlet *x_out, *x_infout; *************** *** 79,83 **** result->priority=priority; result->lifo_start=0; - result->counter=0; /* insert it into the list of priority lists */ --- 79,82 ---- *************** *** 123,127 **** entry->next=lifoprio->lifo_start; lifoprio->lifo_start=entry; - lifoprio->counter++; return 0; --- 122,125 ---- *************** *** 142,146 **** return; } ! add2lifo(plifo, argc, argv); } static void lifop_bang(t_lifop *x) --- 140,148 ---- return; } ! if(!add2lifo(plifo, argc, argv)) ! { ! x->counter++; ! } ! } static void lifop_bang(t_lifop *x) *************** *** 160,164 **** } ! plifo->counter--; plifo->lifo_start=lifo->next; --- 162,166 ---- } ! x->counter--; plifo->lifo_start=lifo->next; *************** *** 182,197 **** } static void lifop_query(t_lifop*x) ! { ! unsigned long counter=0; ! t_lifop_prioritylist*plifo=x->lifo_list; ! ! while(plifo!=NULL){ ! counter+=plifo->counter; ! plifo=plifo->next; ! } ! ! verbose(1, "%d elements in lifo", (int)counter); ! outlet_float(x->x_infout, (t_float)counter); } static void lifop_free(t_lifop *x) --- 184,191 ---- } static void lifop_query(t_lifop*x) ! { ! verbose(1, "%d elements in lifo", (int)x->counter); ! outlet_float(x->x_infout, (t_float)x->counter); } static void lifop_free(t_lifop *x) *************** *** 235,238 **** --- 229,233 ---- x->lifo_list = 0; x->priority=0; + x->counter=0; return (x);

1 0

externals/zexy/src fifop.c,1.6,1.7 lifop.c,1.4,1.5
by IOhannes m zmölnig 04 Dec '05

04 Dec '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7099 Modified Files: fifop.c lifop.c Log Message: added an "info"-outlet,which bangs when the {lf}ifo is empty by sending an [info( message, you can query the total number of elements currently on the stack Index: fifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/fifop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fifop.c 15 Jun 2005 15:58:14 -0000 1.6 --- fifop.c 4 Dec 2005 12:44:33 -0000 1.7 *************** *** 45,48 **** --- 45,49 ---- t_fifop_list *fifo_end; struct _fifop_prioritylist *next; + unsigned long counter; } t_fifop_prioritylist; *************** *** 52,55 **** --- 53,57 ---- t_fifop_prioritylist *fifo_list; t_float priority; /* current priority */ + t_outlet *x_out, *x_infout; } t_fifop; *************** *** 82,85 **** --- 84,88 ---- result->fifo_end=0; result->next=0; + result->counter=0; /* insert it into the list of priority lists */ *************** *** 137,140 **** --- 140,144 ---- fifoprio->fifo_end =entry; } + fifoprio->counter++; return 0; } *************** *** 164,173 **** --- 168,181 ---- if(!(pfifo=getFifo(x->fifo_list))){ + outlet_bang(x->x_infout); return; } if(!(fifo=pfifo->fifo_start)){ + outlet_bang(x->x_infout); return; } + pfifo->counter--; + pfifo->fifo_start=fifo->next; if(0==pfifo->fifo_start){ *************** *** 186,195 **** /* output the list */ ! outlet_list(x->x_obj.ob_outlet, &s_list, argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); } static void fifop_free(t_fifop *x) { --- 194,216 ---- /* output the list */ ! outlet_list(x->x_out, &s_list, argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); } + static void fifop_query(t_fifop*x) + { + unsigned long counter=0; + t_fifop_prioritylist*pfifo=x->fifo_list; + while(pfifo!=NULL){ + counter+=pfifo->counter; + pfifo=pfifo->next; + } + + verbose(1, "%d elements in fifo", (int)counter); + + outlet_float(x->x_infout, (t_float)counter); + } static void fifop_free(t_fifop *x) { *************** *** 218,221 **** --- 239,245 ---- } x->fifo_list=0; + + outlet_free(x->x_out); + outlet_free(x->x_infout); } *************** *** 224,229 **** t_fifop *x = (t_fifop *)pd_new(fifop_class); - outlet_new(&x->x_obj, 0); floatinlet_new(&x->x_obj, &x->priority); x->fifo_list = 0; --- 248,254 ---- t_fifop *x = (t_fifop *)pd_new(fifop_class); floatinlet_new(&x->x_obj, &x->priority); + x->x_out =outlet_new(&x->x_obj, gensym("list" )); + x->x_infout=outlet_new(&x->x_obj, gensym("float")); x->fifo_list = 0; *************** *** 240,243 **** --- 265,269 ---- class_addbang (fifop_class, fifop_bang); class_addlist (fifop_class, fifop_list); + class_addmethod (fifop_class, (t_method)fifop_query, gensym("info"), A_NULL); class_sethelpsymbol(fifop_class, gensym("zexy/fifop")); Index: lifop.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lifop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lifop.c 15 Jun 2005 15:50:08 -0000 1.4 --- lifop.c 4 Dec 2005 12:44:33 -0000 1.5 *************** *** 44,47 **** --- 44,48 ---- t_lifop_list *lifo_start; struct _lifop_prioritylist *next; + unsigned long counter; } t_lifop_prioritylist; typedef struct _lifop *************** *** 50,53 **** --- 51,55 ---- t_lifop_prioritylist *lifo_list; t_float priority; /* current priority */ + t_outlet *x_out, *x_infout; } t_lifop; *************** *** 77,80 **** --- 79,83 ---- result->priority=priority; result->lifo_start=0; + result->counter=0; /* insert it into the list of priority lists */ *************** *** 120,123 **** --- 123,127 ---- entry->next=lifoprio->lifo_start; lifoprio->lifo_start=entry; + lifoprio->counter++; return 0; *************** *** 148,157 **** --- 152,165 ---- if(!(plifo=getLifo(x->lifo_list))){ + outlet_bang(x->x_infout); return; } if(!(lifo=plifo->lifo_start)){ + outlet_bang(x->x_infout); return; } + plifo->counter--; + plifo->lifo_start=lifo->next; *************** *** 168,177 **** /* output the list */ ! outlet_list(x->x_obj.ob_outlet, &s_list, argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); } static void lifop_free(t_lifop *x) { --- 176,198 ---- /* output the list */ ! outlet_list(x->x_out, &s_list, argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); } + static void lifop_query(t_lifop*x) + { + unsigned long counter=0; + t_lifop_prioritylist*plifo=x->lifo_list; + while(plifo!=NULL){ + counter+=plifo->counter; + plifo=plifo->next; + } + + verbose(1, "%d elements in lifo", (int)counter); + + outlet_float(x->x_infout, (t_float)counter); + } static void lifop_free(t_lifop *x) { *************** *** 199,202 **** --- 220,226 ---- } x->lifo_list=0; + + outlet_free(x->x_out); + outlet_free(x->x_infout); } *************** *** 205,210 **** t_lifop *x = (t_lifop *)pd_new(lifop_class); - outlet_new(&x->x_obj, 0); floatinlet_new(&x->x_obj, &x->priority); x->lifo_list = 0; --- 229,235 ---- t_lifop *x = (t_lifop *)pd_new(lifop_class); floatinlet_new(&x->x_obj, &x->priority); + x->x_out=outlet_new(&x->x_obj, gensym("list")); + x->x_infout=outlet_new(&x->x_obj, gensym("float")); x->lifo_list = 0; *************** *** 221,224 **** --- 246,250 ---- class_addbang (lifop_class, lifop_bang); class_addlist (lifop_class, lifop_list); + class_addmethod (lifop_class, (t_method)lifop_query, gensym("info"), A_NULL); class_sethelpsymbol(lifop_class, gensym("zexy/lifop"));

1 0

← Newer
1
...
42
43
44
45
46
47
48
49
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 December 2005