Pd-cvs July 2005

pd-cvs@lists.iem.at

14 participants
187 discussions

externals/grill/py readme.txt,1.38,1.39
by Thomas Grill 18 Jul '05

18 Jul '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27765 Modified Files: readme.txt Log Message: python-like dotted module.function syntax cleaned up float vs. int pyext tags better definition of output values (atoms, lists, anythings) multiply inlets for py (hot and cold inlets) better exception handling and error message fixes for atomic pyext._outlet messages Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** readme.txt 9 Jul 2005 13:03:34 -0000 1.38 --- readme.txt 18 Jul 2005 18:03:11 -0000 1.39 *************** *** 97,100 **** --- 97,102 ---- - ADD: sequence protocol for symbol type - FIX: cleanup for outbound messages (e.g. symbol atoms instead of one-element general messages) + - FIX: better exception handling (no longer leaves reference to function object) and cleared misleading error message + - FIX: better definition of output values for atoms, lists and anythings 0.2.0:

1 0

externals/grill/flext/source flbuf.cpp,1.23,1.24
by Thomas Grill 17 Jul '05

17 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18507/source Modified Files: flbuf.cpp Log Message: changes for devel_0_39 support Index: flbuf.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbuf.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** flbuf.cpp 10 Mar 2005 04:56:40 -0000 1.23 --- flbuf.cpp 17 Jul 2005 11:33:38 -0000 1.24 *************** *** 23,28 **** // check if PD API supports buffer dirty time #if defined(PD_DEVEL_VERSION) && defined(PD_MAJOR_VERSION) && defined(PD_MINOR_VERSION) ! #if PD_MINOR_VERSION >= 36 ! #define FLEXT_PDBUFDIRTYTIME #endif #endif --- 23,30 ---- // check if PD API supports buffer dirty time #if defined(PD_DEVEL_VERSION) && defined(PD_MAJOR_VERSION) && defined(PD_MINOR_VERSION) ! #if PD_MINOR_VERSION >= 36 && PD_MINOR_VERSION <= 38 ! // garray_updatetime has been removed in devel_0_39 ! #define FLEXT_HAVE_GARRAYUPDATETIME ! #define FLEXT_HAVE_GARRAYLOCKS #endif #endif *************** *** 183,187 **** #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #if PD_MINOR_VERSION >= 38 && defined(PD_DEVEL_VERSION) garray_lock(arr); #endif --- 185,189 ---- #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #ifdef FLEXT_HAVE_GARRAYLOCKS garray_lock(arr); #endif *************** *** 208,212 **** #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #if PD_MINOR_VERSION >= 38 && defined(PD_DEVEL_VERSION) garray_unlock(arr); #endif --- 210,214 ---- #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #ifdef FLEXT_HAVE_GARRAYLOCKS garray_unlock(arr); #endif *************** *** 338,342 **** #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #ifdef FLEXT_PDBUFDIRTYTIME return isdirty || garray_updatetime(arr) > cleantime; #else --- 340,344 ---- #if FLEXT_SYS == FLEXT_SYS_PD FLEXT_ASSERT(arr); ! #ifdef FLEXT_HAVE_GARRAYUPDATETIME return isdirty || garray_updatetime(arr) > cleantime; #else

1 0

pd/src SConscript,1.1.4.12,1.1.4.13
by carmen rocco 17 Jul '05

17 Jul '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19508/src Modified Files: Tag: devel_0_39 SConscript Log Message: crack down on vendors serving skewered guinea pigs... Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.12 retrieving revision 1.1.4.13 diff -C2 -d -r1.1.4.12 -r1.1.4.13 *** SConscript 16 Jul 2005 21:18:33 -0000 1.1.4.12 --- SConscript 17 Jul 2005 08:49:41 -0000 1.1.4.13 *************** *** 104,108 **** # system specific configuration ! set = "." pthreadLib = "pthread" --- 104,110 ---- # system specific configuration ! conf = pdenv.Configure() ! ! sep = "." pthreadLib = "pthread" *************** *** 142,146 **** - conf = pdenv.Configure() if not conf.CheckLib('m','sin'): print "can't find Math library" --- 144,147 ----

1 0

extensions/gui/ix mat.wid,1.19,1.20
by carmen rocco 17 Jul '05

17 Jul '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31643 Modified Files: mat.wid Log Message: ... Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mat.wid 11 Jul 2005 19:46:22 -0000 1.19 --- mat.wid 16 Jul 2005 23:45:55 -0000 1.20 *************** *** 52,57 **** switch [dict get $d type] { note { ! $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags r] -stroke [color [darken [dict get $_($t:g) $_($t:cg) color] 0.2]] ! $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags q] -fill [color [dict get $_($t:g) $_($t:cg) color]] -strokewidth 0 -fillopacity 0.8 } sound { --- 52,58 ---- switch [dict get $d type] { note { ! set color [dict get $_($t:g) $_($t:cg) color] ! $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags r] -stroke [color [lighten $color 0.4]] -strokeopacity 1.0 -fill [color $color] -fillopacity 0.08 ! $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags q] -fill [color $color] -strokewidth 0 -fillopacity 0.8 } sound { *************** *** 123,143 **** default {}} foreach id $items { ! set px [mat_tr $p $t x t [dict get $_($t) $id x]] ! set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set w [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}] ! set h [expr {[dict get $_($t) $id yy] - [dict get $_($t) $id y]}] switch [dict get $_($t) $id type] { note { ! if {$h < 0.01} {set h 1} ! set sx [expr {abs([mat_tr $p $t x id $w])}] ! set sy [expr {abs([mat_tr $p $t y id $h])}] set r [$p.m find withtag "i$id && r"] set q [$p.m find withtag "i$id && q"] ! $p.m coords $r [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] ! $p.m coords $q [::tkpath::coords rect [mat_quant $p $t x $px] [mat_quant $p $t y $py] $sx $sy -rx 3 -ry 3] $p.m itemconfigure $q -fillopacity [dict get $_($t) $id v] } sound { ! $p.m coords [$p.m find withtag i$id] $px $py } } --- 124,145 ---- default {}} foreach id $items { ! set x [mat_tr $p $t x t [dict get $_($t) $id x]] ! set y [mat_tr $p $t y t [dict get $_($t) $id y]] ! set qx [mat_tr $p $t x t [mat_quant $p $t x [dict get $_($t) $id x]]] ! set qy [mat_tr $p $t y t [mat_quant $p $t y [dict get $_($t) $id y]]] switch [dict get $_($t) $id type] { note { ! set sx [expr abs([mat_tr $p $t x id [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}]])] ! set qsx [expr abs([mat_tr $p $t x id [expr {[mat_quant $p $t x [dict get $_($t) $id xx]] - [mat_quant $p $t x [dict get $_($t) $id x]]}]])] ! set sy [expr abs([mat_tr $p $t y id 1])] ! set ro [expr {int( $sy / 2.0 )}] set r [$p.m find withtag "i$id && r"] set q [$p.m find withtag "i$id && q"] ! $p.m coords $r [::tkpath::coords rect $x $y $sx $sy -rx $ro -ry $ro] ! $p.m coords $q [::tkpath::coords rect $qx $qy $qsx $sy -rx $ro -ry $ro] $p.m itemconfigure $q -fillopacity [dict get $_($t) $id v] } sound { ! $p.m coords [$p.m find withtag i$id] $x $y } } *************** *** 176,179 **** --- 178,185 ---- proc mat_resize_top {p t a x y} {mat_resize_object $p $t y $x $y} proc mat_resize_bottom {p t a x y} {mat_resize_object $p $t yy $x $y} + proc mat_resize_tl {p t a x y} {mat_resize_object $p $t x $x $y; mat_resize_object $p $t y $x $y} + proc mat_resize_tr {p t a x y} {mat_resize_object $p $t x $x $y; mat_resize_object $p $t yy $x $y} + proc mat_resize_bl {p t a x y} {mat_resize_object $p $t xx $x $y; mat_resize_object $p $t y $x $y} + proc mat_resize_br {p t a x y} {mat_resize_object $p $t xx $x $y; mat_resize_object $p $t yy $x $y} proc mat_resize_object {p t e x y} { *************** *** 205,216 **** mat_mode $p $t move_object set id [lindex $clicked 0] ! set eX [mat_tr $p $t x t [dict get $_($t) $id x]] ! set eXX [mat_tr $p $t x t [dict get $_($t) $id xx]] ! set eY [mat_tr $p $t y t [dict get $_($t) $id y]] ! set eYY [mat_tr $p $t y t [dict get $_($t) $id yy]] ! if {[expr {abs($eX - $x)}] < 5} {mat_mode $p $t resize_left} ! if {[expr {abs($eXX - $x)}] < 5} {mat_mode $p $t resize_right} ! if {[expr {abs($eY - $y)}] < 1} {mat_mode $p $t resize_top} ! if {[expr {abs($eYY - $y)}] < 1} {mat_mode $p $t resize_bottom} if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} mat_updatesel $p $t $clicked --- 211,237 ---- mat_mode $p $t move_object set id [lindex $clicked 0] ! set d 3 ! set dx [expr {abs([mat_tr $p $t x t [dict get $_($t) $id x]] - $x)}] ! set dxx [expr {abs([mat_tr $p $t x t [dict get $_($t) $id xx]] - $x)}] ! set dy [expr {abs([mat_tr $p $t y t [dict get $_($t) $id y]] - $y)}] ! set dyy [expr {abs([mat_tr $p $t y t [dict get $_($t) $id yy]] - $y)}] ! puts "d: x $dx y $dy xx $dxx yy $dyy" ! if {$dx < $d && $dy < $d} { ! mat_mode $p $t resize_tl ! } elseif {$dxx < $d && $dy < $d} { ! mat_mode $p $t resize_tr ! } elseif {$dx < $d && $dyy < $d} { ! mat_mode $p $t resize_bl ! } elseif {$dxx < $d && $dyy < $d} { ! mat_mode $p $t resize_br ! } elseif {$dx < $d} { ! mat_mode $p $t resize_left ! } elseif {$dxx < $d} { ! mat_mode $p $t resize_right ! } elseif {$dy < $d} { ! mat_mode $p $t resize_top ! } elseif {$dyy < $d} { ! mat_mode $p $t resize_bottom ! } if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} mat_updatesel $p $t $clicked *************** *** 219,223 **** } } ! proc mat_item_info {p t clicked} { variable _ --- 240,244 ---- } } ! proc mat_item_info {p t clicked} { variable _ *************** *** 343,347 **** proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox item_v box_spiral resize_canvas bogosity sel cross_reverse resize_left left_side resize_right right_side resize_top top_side resize_bottom bottom_side} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) --- 364,368 ---- proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox item_v box_spiral resize_canvas bogosity sel cross_reverse resize_left left_side resize_right right_side resize_top top_side resize_bottom bottom_side resize_tl top_left_corner resize_tr top_right_corner resize_bl bottom_left_corner resize_br bottom_right_corner} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) *************** *** 495,499 **** #> mat frame #. -bd 3 #w 384 #h 144 #bg gray86 #ln white ! #. #Xa 123 #Xb 2000 #Ya 0 #Yb 127 #qx 125 #qy 1 #mx 12 #my 64 #. @list ::ix::mat_add .- .| {.#1} .#2 .#3 .#4 #. @add ::ix::mat_add .- .| {.#1} .#2 .#3 .#4 --- 516,520 ---- #> mat frame #. -bd 3 #w 384 #h 144 #bg gray86 #ln white ! #. #Xa 123 #Xb 2000 #Ya 127 #Yb 0 #qx 50 #qy 1 #mx 12 #my 64 #. @list ::ix::mat_add .- .| {.#1} .#2 .#3 .#4 #. @add ::ix::mat_add .- .| {.#1} .#2 .#3 .#4

1 0

externals/build SConstruct,1.10,1.11
by carmen rocco 17 Jul '05

17 Jul '05

Update of /cvsroot/pure-data/externals/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21963 Modified Files: SConstruct Log Message: Cwin32 + prefix settable adding Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/externals/build/SConstruct,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SConstruct 12 Jul 2005 19:11:08 -0000 1.10 --- SConstruct 16 Jul 2005 22:47:49 -0000 1.11 *************** *** 2,33 **** import os import re - prefix = "/usr/local/lib/pd" - - platform = os.uname()[0] ! if re.match("Linux", platform) != None: ! OSdefine = 'UNIX' ! extSuffix = '.pd_linux' ! elif re.match("MINGW", platform) != None: ! OSdefine = 'NT' ! extSuffix = '.dll' ! elif re.match("Darwin", platform) != None: ! OSdefine = 'UNIX' ! extSuffix = '.pd_darwin' ! env = Environment(CPPPATH = Split(prefix + '/src /usr/include /usr/local/include . ../../pd/src ../../src src'), CPPDEFINES=['PD', OSdefine], SHLIBPREFIX = '', SHLIBSUFFIX = extSuffix, CCFLAGS = '-pipe -O2') ! ########### delete when namespace conflict issue is finally resolved ! ##(cyclone has all of these, the other versions are from all over the place) ! delete = """ ! cd src && test -f prepend.c && rm urn.* match.* prepend.* sinh.c delta~.c reson~.c abs~.c svf~.c matrix~.c atan2~.c avg~.c pmpd.c && echo "poof...no more conflicting externals..!!" ! """ ! print os.popen(delete).read() ! ########### # C sources in src/ for extra in glob.glob('src/*.c'): ! external = env.SharedLibrary(re.sub("\.c$","",os.path.basename(extra)), extra) env.Alias('install', env.Install(os.path.join(prefix, 'extra'), external)) Default(external) --- 2,33 ---- import os import re ! env = Environment(CPPPATH = Split('/usr/include /usr/local/include . ../../pd/src ../../src src'), CPPDEFINES=['PD'], SHLIBPREFIX = '', CCFLAGS = '-pipe -O2') ! opt = Options(['options.cache', 'custom.py']) ! opt.AddOptions(('prefix', 'install prefix', '/usr/local/lib/pd')) ! opt.Update(env) ! opt.Save('options.cache',env) ! prefix = env['prefix'] ! if env['PLATFORM'] == 'win32': ! env.Append(CPPDEFINES='NT') ! env.Append(LINKFLAGS=prefix+'bin/pd.dll') ! env['SHLIBSUFFIX']='.dll' ! elif env['PLATFORM'] == 'darwin': ! env.Append(CPPDEFINES='UNIX') ! env['SHLIBSUFFIX']='.pd_darwin' ! elif env['PLATFORM'] == 'posix': ! env.Append(CPPDEFINES='UNIX') ! env['SHLIBSUFFIX']='.pd_linux' + #remove one-off externals that are also in cyclone + print os.popen("""cd src && test -f prepend.c && rm urn.* match.* prepend.* sinh.c delta~.c reson~.c abs~.c svf~.c matrix~.c atan2~.c avg~.c pmpd.c && echo "poof...no more conflicting externals..!!" """).read() # C sources in src/ for extra in glob.glob('src/*.c'): ! name = re.sub("\.c$","",os.path.basename(extra)) ! print name, ! external = env.SharedLibrary(name,'src/'+name+'.c') env.Alias('install', env.Install(os.path.join(prefix, 'extra'), external)) Default(external)

1 0

externals/nusmuk/line3 line3.c,1.1.1.1,1.2
by cyrille 17 Jul '05

17 Jul '05

Update of /cvsroot/pure-data/externals/nusmuk/line3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13313 Modified Files: line3.c Log Message: bugfix with [0,1 100< message Index: line3.c =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/line3/line3.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** line3.c 27 Jan 2005 12:03:45 -0000 1.1.1.1 --- line3.c 16 Jul 2005 22:02:12 -0000 1.2 *************** *** 69,79 **** else { ! t = (timenow - x->x_prevtime); ! tmp = x->a * t * t * t + x->b * t * t + x->setderiv * t + x->x_setval; ! outlet_float(x->x_obj.ob_outlet, tmp); ! clock_delay(x->x_clock, ! (x->x_grain > msectogo ? msectogo : x->x_grain)); } } --- 69,78 ---- else { ! t = (timenow - x->x_prevtime); ! tmp = x->a * t * t * t + x->b * t * t + x->setderiv * t + x->x_setval; ! outlet_float(x->x_obj.ob_outlet, tmp); ! clock_delay(x->x_clock, (x->x_grain > msectogo ? msectogo : x->x_grain)); } } *************** *** 84,91 **** if (x->x_gotinlet && x->x_in1val > 0) { ! if (timenow > x->x_targettime) { x->x_setval = x->x_targetval; ! x->setderiv = 0; } else --- 83,90 ---- if (x->x_gotinlet && x->x_in1val > 0) { ! if (timenow >= x->x_targettime) { x->x_setval = x->x_targetval; ! x->setderiv = 0; } else *************** *** 95,100 **** x->setderiv = 3 * x->a * (timenow - x->x_prevtime) * (timenow - x->x_prevtime) + 2 * x->b * (timenow - x->x_prevtime) + x->setderiv; ! } ! x->x_prevtime = timenow; x->x_targettime = clock_getsystimeafter(x->x_in1val); --- 94,98 ---- x->setderiv = 3 * x->a * (timenow - x->x_prevtime) * (timenow - x->x_prevtime) + 2 * x->b * (timenow - x->x_prevtime) + x->setderiv; ! } x->x_prevtime = timenow; x->x_targettime = clock_getsystimeafter(x->x_in1val); *************** *** 120,123 **** --- 118,122 ---- clock_unset(x->x_clock); x->x_targetval = x->x_setval = f; + x->x_targettime = timenow; outlet_float(x->x_obj.ob_outlet, f); }

1 0

pd/extra SConscript,1.1.2.1,1.1.2.2
by carmen rocco 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6154/extra Modified Files: Tag: devel_0_39 SConscript Log Message: : AasdasdOMGFUCKINGVI I HATE YOU!!!! A ---------------------------------------------------------------------- Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/extra/Attic/SConscript,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** SConscript 16 Jul 2005 14:20:03 -0000 1.1.2.1 --- SConscript 16 Jul 2005 21:18:23 -0000 1.1.2.2 *************** *** 5,9 **** extra_env['SHLIBPREFIX']='' ! if extra_env['PLATFORM'] == 'darwin': extra_env['SHLIBSUFFIX']='.pd_darwin' elif extra_env['PLATFORM'] == 'posix': --- 5,16 ---- extra_env['SHLIBPREFIX']='' ! if extra_env['PLATFORM'] == 'win32': ! if ['msvc'] in pdenv['TOOLS']: ! extra_env.Append(LINKFLAGS='src/pd.lib') ! else: ! extra_env.Append(LINKFLAGS='src/pd.dll') ! extra_env.Append(CPPDEFINES=Split("NT")) ! extra_env['SHLIBSUFFIX']='.dll' ! elif extra_env['PLATFORM'] == 'darwin': extra_env['SHLIBSUFFIX']='.pd_darwin' elif extra_env['PLATFORM'] == 'posix': *************** *** 20,25 **** for extra in Split("expr expr~ fexpr~"): ! extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c', ! Split("vexp vexp_fun vexp_if")))) Default(extras) --- 27,31 ---- for extra in Split("expr expr~ fexpr~"): ! extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c', Split("vexp vexp_fun vexp_if")))) Default(extras)

1 0

pd/src SConscript, 1.1.4.11, 1.1.4.12 s_entry.c, 1.2.4.2, 1.2.4.2.2.1 t_tkcmd.c, 1.2.4.1.2.1, 1.2.4.1.2.2
by carmen rocco 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6154/src Modified Files: Tag: devel_0_39 SConscript s_entry.c t_tkcmd.c Log Message: : AasdasdOMGFUCKINGVI I HATE YOU!!!! A ---------------------------------------------------------------------- Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.11 retrieving revision 1.1.4.12 diff -C2 -d -r1.1.4.11 -r1.1.4.12 *** SConscript 14 Jul 2005 19:56:27 -0000 1.1.4.11 --- SConscript 16 Jul 2005 21:18:33 -0000 1.1.4.12 *************** *** 11,14 **** --- 11,15 ---- BoolOption('debug', 'Build with debugging symbols', False), BoolOption('nosimd', 'Build without simd instructions', False), + BoolOption('portaudio', 'Build with portaudio', True), BoolOption('threadedsf', 'Build with threaded soundfiler', False), BoolOption('atomic', 'Build with atomic operations', False), *************** *** 98,101 **** --- 99,138 ---- defs = [] + + ###################################################################### + # + # system specific configuration + + set = "." + pthreadLib = "pthread" + + if pdenv['PLATFORM'] == 'posix': + if conf.CheckLib('dl', 'dlopen'): + defs.append('DL_OPEN') + else: + print "libdl not found. dynamic loading of externals disabled" + + + jack = conf.CheckLib('jack','jack_activate') + alsa = conf.CheckLib('asound','snd_pcm_info') + + + if pdenv['PLATFORM'] == 'win32': + portaudio = False + if ['msvc'] in pdenv['TOOLS']: + pthreadLib = "pthreadVC" + else: + sep = "" + pthreadLib = "pthreadGC2" + pass + + if pdenv['PLATFORM'] == 'darwin': + portaudio = True + + ## hardcoding the search paths ... ugly, but works + pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/ + /Library/Frameworks/Tcl.framework/Headers/""")) + + ###################################################################### ###################################################################### *************** *** 113,117 **** if not conf.CheckLib('tcl'): for i in range (0,10): ! if conf.CheckLib('tcl8.%d' % i): break else: --- 150,154 ---- if not conf.CheckLib('tcl'): for i in range (0,10): ! if conf.CheckLib('tcl8%s%d' % (sep,i)): break else: *************** *** 121,125 **** if not conf.CheckLib('tk'): for i in range (0,10): ! if conf.CheckLib('tk8.%d' % i): break else: --- 158,162 ---- if not conf.CheckLib('tk'): for i in range (0,10): ! if conf.CheckLib('tk8%s%d' % (sep,i)): break else: *************** *** 152,156 **** ! if not conf.CheckLib('pthread', 'pthread_create'): print "can't find pthread library" Exit(1) --- 189,193 ---- ! if not conf.CheckLib(pthreadLib, 'pthread_create'): print "can't find pthread library" Exit(1) *************** *** 161,191 **** ###################################################################### # - # system specific configuration - - if pdenv['PLATFORM'] == 'posix': - if conf.CheckLib('dl', 'dlopen'): - defs.append('DL_OPEN') - else: - print "libdl not found. dynamic loading of externals disabled" - - - jack = conf.CheckLib('jack','jack_activate') - alsa = conf.CheckLib('asound','snd_pcm_info') - - - if pdenv['PLATFORM'] == 'win32': - portaudio = True - pass - - if pdenv['PLATFORM'] == 'darwin': - portaudio = True - - ## hardcoding the search paths ... ugly, but works - pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/ - /Library/Frameworks/Tcl.framework/Headers/""")) - - - ###################################################################### - # # cleaning up --- 198,201 ---- *************** *** 248,252 **** windows_sources = Split("""s_audio_mmio.c ! s_audio_asio.cpp s_midi_mmio.c""") windows_defs = Split("MSW USEAPI_ASIO") --- 258,262 ---- windows_sources = Split("""s_audio_mmio.c ! s_audio_asio.cpp asio.cpp asiodrivers.cpp asiolist.cpp s_midi_mmio.c""") windows_defs = Split("MSW USEAPI_ASIO") *************** *** 259,262 **** --- 269,275 ---- pdenv.Append(CPPDEFINES=windows_defs) + win_libs = Split("ole32 winmm wsock32") + pdenv.Append(LIBS=win_libs) + pdenv['pdlib'] = True ## split pd to pd.exe and pd.dll *************** *** 347,352 **** # portaudio stuff ! pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) ! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio")) --- 360,366 ---- # portaudio stuff ! if pdenv['portaudio']: ! pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) ! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio")) *************** *** 410,415 **** LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), ! LIBS=Split('tcl tk')) --- 424,428 ---- LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c")) *************** *** 421,429 **** pdenv.Append(LIBPATH=['.']) pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd']) ! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources) pdlib = None ! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdtk) Export("pdenv") --- 434,445 ---- pdenv.Append(LIBPATH=['.']) pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd']) ! Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources) pdlib = None ! Default(pdsend, pdreceive, pdgui, pd, pdtk) ! ! if pdenv['PLATFORM'] != 'win32': ! Default(pdwatchdog) Export("pdenv") Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.2.4.1.2.1 retrieving revision 1.2.4.1.2.2 diff -C2 -d -r1.2.4.1.2.1 -r1.2.4.1.2.2 *** t_tkcmd.c 12 Jul 2005 15:11:12 -0000 1.2.4.1.2.1 --- t_tkcmd.c 16 Jul 2005 21:18:33 -0000 1.2.4.1.2.2 *************** *** 572,576 **** } ! #ifndef MSW void pdgui_setname(char *s) { --- 572,576 ---- } ! #if !defined(MSW) || (defined(MSW) && defined (__GNUC__)) void pdgui_setname(char *s) { Index: s_entry.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.2.2.1 diff -C2 -d -r1.2.4.2 -r1.2.4.2.2.1 *** s_entry.c 11 Jan 2005 21:41:14 -0000 1.2.4.2 --- s_entry.c 16 Jul 2005 21:18:33 -0000 1.2.4.2.2.1 *************** *** 4,8 **** int sys_main(int argc, char **argv); ! #ifdef MSW #include <windows.h> #include <stdio.h> --- 4,8 ---- int sys_main(int argc, char **argv); ! #if defined(MSW) && !defined (__GNUC__) #include <windows.h> #include <stdio.h> *************** *** 22,26 **** } ! #else /* not MSW */ int main(int argc, char **argv) { --- 22,26 ---- } ! #else /* not MSVC */ int main(int argc, char **argv) {

1 0

pd SConstruct,1.1.4.4,1.1.4.5
by carmen rocco 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6154 Modified Files: Tag: devel_0_39 SConstruct Log Message: : AasdasdOMGFUCKINGVI I HATE YOU!!!! A ---------------------------------------------------------------------- Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** SConstruct 13 Jul 2005 22:49:38 -0000 1.1.4.4 --- SConstruct 16 Jul 2005 21:18:22 -0000 1.1.4.5 *************** *** 38,55 **** prefix = env['prefix'] ! if env['PLATFORM'] == 'posix': ! env.Install(prefix+'/bin', pdsend) ! env.Install(prefix+'/bin', pdreceive) ! env.Install(prefix+'/bin', pd) ! env.Install(prefix+'/lib/pd/bin', pdgui) env.Install(prefix+'/lib/pd/bin', pdwatchdog) ! env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk') ! for extra in extras: ! env.Install(prefix+'/lib/extra/', extra) ! try: ! env.Install(prefix+'/lib', pdlib) ! except: ! pass ! ! env.Alias('install', prefix) --- 38,55 ---- prefix = env['prefix'] ! env.Install(prefix+'/bin', pdsend) ! env.Install(prefix+'/bin', pdreceive) ! env.Install(prefix+'/bin', pd) ! env.Install(prefix+'/lib/pd/bin', pdgui) ! if env['PLATFORM']=='posix': env.Install(prefix+'/lib/pd/bin', pdwatchdog) ! env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk') ! for extra in extras: ! env.Install(prefix+'/lib/extra/', extra) ! try: ! env.Install(prefix+'/lib', pdlib) ! except: ! pass ! ! env.Alias('install', prefix)

1 0

[PD-cvs] pd/extra/lrshift~ lrshift~.c, NONE, 1.3.4.2 makefile, NONE, 1.6.8.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/lrshift~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/lrshift~ Added Files: Tag: devel_0_39 lrshift~.c makefile Log Message: missing extra files --- NEW FILE: makefile --- NAME=lrshift~ CSYM=lrshift_tilde current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\bin\pd.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) # ----------------------- IRIX 5.x ----------------------- pd_irix5: $(NAME).pd_irix5 .SUFFIXES: .pd_irix5 SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 SGIINCLUDE = -I../../src .c.pd_irix5: $(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o rm $*.o # ----------------------- IRIX 6.x ----------------------- pd_irix6: $(NAME).pd_irix6 .SUFFIXES: .pd_irix6 SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -Ofast=ip32 .c.pd_irix6: $(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o rm $*.o # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations --- NEW FILE: lrshift~.c --- #include "m_pd.h" /* ------------------------ lrshift~ ----------------------------- */ static t_class *lrshift_tilde_class; typedef struct _lrshift_tilde { t_object x_obj; int x_n; } t_lrshift_tilde; static t_int *leftshift_perform(t_int *w) { t_float *in = (t_float *)(w[1]); t_float *out= (t_float *)(w[2]); int n = (int)(w[3]); int shift = (int)(w[4]); in += shift; n -= shift; while (n--) *out++ = *in++; while (shift--) *out++ = 0; return (w+5); } static t_int *rightshift_perform(t_int *w) { t_float *in = (t_float *)(w[1]); t_float *out= (t_float *)(w[2]); int n = (int)(w[3]); int shift = (int)(w[4]); n -= shift; in -= shift; while (n--) *--out = *--in; while (shift--) *--out = 0; return (w+5); } static void lrshift_tilde_dsp(t_lrshift_tilde *x, t_signal **sp) { int n = sp[0]->s_n; int shift = x->x_n; if (shift > n) shift = n; if (shift < -n) shift = -n; if (shift < 0) dsp_add(rightshift_perform, 4, sp[0]->s_vec + n, sp[1]->s_vec + n, n, -shift); else dsp_add(leftshift_perform, 4, sp[0]->s_vec, sp[1]->s_vec, n, shift); } static void *lrshift_tilde_new(t_floatarg f) { t_lrshift_tilde *x = (t_lrshift_tilde *)pd_new(lrshift_tilde_class); x->x_n = f; outlet_new(&x->x_obj, gensym("signal")); return (x); } void lrshift_tilde_setup(void) { lrshift_tilde_class = class_new(gensym("lrshift~"), (t_newmethod)lrshift_tilde_new, 0, sizeof(t_lrshift_tilde), 0, A_DEFFLOAT, 0); class_addmethod(lrshift_tilde_class, nullfn, gensym("signal"), 0); class_addmethod(lrshift_tilde_class, (t_method)lrshift_tilde_dsp, gensym("dsp"), 0); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
19
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 2005