Pd-cvs April 2006

pd-cvs@lists.iem.at

15 participants
271 discussions

externals/moocow/gfsm configure.in,1.1,1.2
by Bryan Jurish 20 Apr '06

20 Apr '06

Update of /cvsroot/pure-data/externals/moocow/gfsm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11344 Modified Files: configure.in Log Message: v0.401: added experimental lookup() and paths() Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/gfsm/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.in 2 Feb 2006 12:44:29 -0000 1.1 --- configure.in 20 Apr 2006 09:42:14 -0000 1.2 *************** *** 5,9 **** dnl Some handy macros define([THE_PACKAGE_NAME], [pd-gfsm]) ! define([THE_PACKAGE_VERSION], [0.04]) define([THE_PACKAGE_AUTHOR], [moocow(a)ling.uni-potsdam.de]) --- 5,9 ---- dnl Some handy macros define([THE_PACKAGE_NAME], [pd-gfsm]) ! define([THE_PACKAGE_VERSION], [0.0401]) define([THE_PACKAGE_AUTHOR], [moocow(a)ling.uni-potsdam.de])

1 0

pd/src objective.tcl,1.1.2.8,1.1.2.9
by Mathieu Bouchard 20 Apr '06

20 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30707 Modified Files: Tag: devel_0_39 objective.tcl Log Message: now supports @$ and $@$ syntaxes, for variable instance variable. Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** objective.tcl 16 Apr 2006 08:30:45 -0000 1.1.2.8 --- objective.tcl 20 Apr 2006 01:46:32 -0000 1.1.2.9 *************** *** 37,45 **** 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)]" } --- 37,45 ---- 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)]" } *************** *** 112,115 **** --- 112,116 ---- #set _(Thing:_super) {} def* Thing init {} {} + def Thing == {other} {return [expr ![string compare $self $other]]} # virtual destructor

1 0

pd/src desire.tk,1.1.2.166,1.1.2.167
by Mathieu Bouchard 20 Apr '06

20 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27977 Modified Files: Tag: devel_0_39 desire.tk Log Message: objectivising pdrc_editor Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.166 retrieving revision 1.1.2.167 diff -C2 -d -r1.1.2.166 -r1.1.2.167 *** desire.tk 20 Apr 2006 01:21:04 -0000 1.1.2.166 --- desire.tk 20 Apr 2006 01:42:41 -0000 1.1.2.167 *************** *** 3464,3472 **** } pack $f -side top -fill x - #<<<<<<< desire.tk - # catch {$f.label configure -width 40 -anchor e} - #======= catch {$f.label configure -width 45 -anchor nw} - #>>>>>>> 1.1.2.165 } } --- 3464,3468 ---- *************** *** 3583,3606 **** } proc pdrc_editor_ok {self} {pdrc_editor_apply $self; pdrc_editor_cancel $self} proc pdrc_editor_cancel {self} {destroy $self} proc pdrc_editor_apply {self} { set self [string trimleft $self .] ! pdrc_write $self } ! proc notebook_select {self i} { ! global _ catch { ! .$self.bar.$_($self:section) configure -relief raised ! place forget .$self.main.$_($self:section) } ! set _($self:section) $i ! place .$self.main.$_($self:section) -x 0 -y 0 ! .$self.bar.$_($self:section) configure -relief sunken } ! proc pdrc_read {self} { ! global pdrc_options pdrc_options_h _ cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] set contents [split [string map {"\n" " "} [read $fd]] " "] --- 3579,3604 ---- } + class_new pdrc_editor + proc pdrc_editor_ok {self} {pdrc_editor_apply $self; pdrc_editor_cancel $self} proc pdrc_editor_cancel {self} {destroy $self} proc pdrc_editor_apply {self} { set self [string trimleft $self .] ! pdrc_editor_write $self } ! def pdrc_editor page_select {i} { ! set f .$self.1 catch { ! $f.bar.$@section configure -relief raised ! place forget $f.main.$@section } ! set @section $i ! place $f.main.$@section -x 0 -y 0 ! $f.bar.$@section configure -relief sunken } ! def pdrc_editor read {} { ! global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] set contents [split [string map {"\n" " "} [read $fd]] " "] *************** *** 3631,3636 **** } ! proc pdrc_write {self} { ! global pdrc_options pdrc_options_h _ cmdline set fd [open $cmdline(rcfilename) w] foreach {type name desc} $pdrc_options { --- 3629,3634 ---- } ! def pdrc_editor write {} { ! global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) w] foreach {type name desc} $pdrc_options { *************** *** 3647,3659 **** } ! proc pdrc_editor_new {} { global _ pdrc_options ! set self pdrc ! pdrc_read $self toplevel .$self ! frame .$self.1 ! frame .$self.1.bar ! frame .$self.1.buttonsep -height 2 -borderwidth 1 -relief sunken ! frame .$self.1.main -borderwidth 1 -relief raised -width 600 -height 350 set section 0 foreach {type name desc} $pdrc_options { --- 3645,3657 ---- } ! def pdrc_editor init {} { global _ pdrc_options ! $self read toplevel .$self ! set f .$self.1 ! frame $f ! frame $f.bar ! frame $f.buttonsep -height 2 -borderwidth 1 -relief sunken ! frame $f.main -borderwidth 1 -relief raised -width 600 -height 350 set section 0 foreach {type name desc} $pdrc_options { *************** *** 3662,3673 **** section { incr section ! frame .$self.1.main.$section ! button .$self.1.bar.$section -text $desc \ ! -command [list notebook_select $self.1 $section] ! pack .$self.1.bar.$section -side left } alias {} radio { ! properties_dialog $self .$self.1.main.$section pdrc_editor_ok \ [list [lindex $name 0] "$desc" choice {}] } --- 3660,3670 ---- section { incr section ! frame $f.main.$section ! pack [button $f.bar.$section -text $desc \ ! -command [list $self page_select $section]] -side left } alias {} radio { ! properties_dialog $self $f.main.$section pdrc_editor_ok \ [list [lindex $name 0] "$desc" choice {}] } *************** *** 3675,3679 **** #properties_dialog $self .$self.1.main.$section pdrc_editor_ok \ # [list $name "$name: $desc" $type {}] ! properties_dialog $self .$self.1.main.$section pdrc_editor_ok \ [list $name $desc $type {}] } --- 3672,3676 ---- #properties_dialog $self .$self.1.main.$section pdrc_editor_ok \ # [list $name "$name: $desc" $type {}] ! properties_dialog $self $f.main.$section pdrc_editor_ok \ [list $name $desc $type {}] } *************** *** 3681,3693 **** } cancel_apply_ok $self pdrc_editor ! notebook_select $self.1 1 ! pack .$self.1.bar -fill x ! pack .$self.1.buttonsep ! pack .$self.1.main -fill both -expand yes ! pack .$self.1 ! return $self } ! def Client pdrc_editor {} {pdrc_editor_new} ############ other stuff ######### --- 3678,3689 ---- } cancel_apply_ok $self pdrc_editor ! $self page_select 1 ! pack $f.bar -fill x ! pack $f.buttonsep ! pack $f.main -fill both -expand yes ! pack $f } ! def Client pdrc_editor {} {pdrc_editor new_as pdrc} ############ other stuff #########

1 0

pd/src desire.tk,1.1.2.165,1.1.2.166
by Mathieu Bouchard 20 Apr '06

20 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10622 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed File->Quit added mousewheel support to spinboxes Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.165 retrieving revision 1.1.2.166 diff -C2 -d -r1.1.2.165 -r1.1.2.166 *** desire.tk 19 Apr 2006 14:18:24 -0000 1.1.2.165 --- desire.tk 20 Apr 2006 01:21:04 -0000 1.1.2.166 *************** *** 174,178 **** #end ! set history [History_new] #-----------------------------------------------------------------------------------# --- 174,178 ---- #end ! set history [History new] #-----------------------------------------------------------------------------------# *************** *** 486,494 **** proc pdtk_watchdog {} {pd pd ping; after 2000 {pdtk_watchdog}} - proc pdtk_check {x message} { - set answer [tk_messageBox -message $x -type yesno -icon question] - switch -- $answer {yes {pd $message}} - } - set menu_windowlist {} --- 486,489 ---- *************** *** 573,577 **** proc menu_really_quit {} {pd pd quit} ! proc menu_quit {} {pdtk_check "Do you really wish to quit?" {pd quit}} proc menu_pop_pd {} {raise .} proc menu_audio {flag} {pd pd dsp $flag} --- 568,576 ---- proc menu_really_quit {} {pd pd quit} ! def Client quit {} { ! set answer [tk_messageBox -message "Do you really wish to quit?" -type yesno -icon question] ! switch -- $answer {yes {pd pd quit; exit}} ! } ! proc menu_pop_pd {} {raise .} proc menu_audio {flag} {pd pd dsp $flag} *************** *** 1918,1927 **** } move { ! puts "something moved ::: $@selection" ! foreach obj $@selection { ! ##this could be wrong.... ! mset {x y} [$obj xy] ! pd .$self object_moveto !$obj $x $y } --- 1917,1925 ---- } move { ! puts "something moved ::: $@selection" foreach obj $@selection { ! #this could be wrong.... ! mset {x y} [$obj xy] ! pd .$self object_moveto !$obj $x $y } *************** *** 2482,2487 **** } - def Thing == {other} {return [expr ![string compare $self $other]]} - def* numbox draw {} { $self update_size --- 2480,2483 ---- *************** *** 3385,3390 **** side { frame $f ! label $f.label -text $label ! pack $f.label -side left frame $f.side -relief ridge -borderwidth 2 foreach {i side} {0 left 1 right 2 top 3 bottom} { --- 3381,3385 ---- side { frame $f ! pack [label $f.label -text $label] -side left frame $f.side -relief ridge -borderwidth 2 foreach {i side} {0 left 1 right 2 top 3 bottom} { *************** *** 3416,3425 **** frame $f set i 0 ! label $f.label -text [lindex $label 0] ! pack $f.label $f -side left set m [menu .popupMenu -tearoff 0] foreach part [lrange $label 1 end] { ! $m add command -label $part -command [list dropmenu_set $f $part] #radiobutton $f.$i -text $part -value $i -variable _($self:$name) -anchor w #pack $f.$i -side top -fill x --- 3411,3419 ---- frame $f set i 0 ! pack [label $f.label -text [lindex $label 0]] $f -side left set m [menu .popupMenu -tearoff 0] foreach part [lrange $label 1 end] { ! $m add command -label $part -command [list dropmenu_set $f $part] #radiobutton $f.$i -text $part -value $i -variable _($self:$name) -anchor w #pack $f.$i -side top -fill x *************** *** 3442,3450 **** default { frame $f #label $f.label -text $label -wraplength 200 -justify left ! label $f.label -text $label balloon $f.label $name ! pack $f.label -side left eval "entry $f.entry -textvariable _($self:$name) $options" pack $f.entry -side left --- 3436,3445 ---- default { frame $f + #pack [label $f.label -text $label] -side left #label $f.label -text $label -wraplength 200 -justify left ! pack [label $f.label -text $label] -side left balloon $f.label $name ! eval "entry $f.entry -textvariable _($self:$name) $options" pack $f.entry -side left *************** *** 3457,3460 **** --- 3452,3457 ---- pack $f.b.1 $f.b.2 -side top pack $f.b -side left + bind $f.entry <Button-4> "change_entry $f.entry +1" + bind $f.entry <Button-5> "change_entry $f.entry -1" } entry {} *************** *** 3467,3471 **** --- 3464,3472 ---- } pack $f -side top -fill x + #<<<<<<< desire.tk + # catch {$f.label configure -width 40 -anchor e} + #======= catch {$f.label configure -width 45 -anchor nw} + #>>>>>>> 1.1.2.165 } } *************** *** 3701,3711 **** #c lsort proably does what u want (has an integer flag too) ! set manager [Manager_new] def Class post_hierarchy {{i 0}} { post %*s%s [expr $i*2] "" $self ! foreach sub $@subclasses { ! $sub post_hierarchy [expr $i+1] ! } } Thing post_hierarchy --- 3702,3710 ---- #c lsort proably does what u want (has an integer flag too) ! set manager [Manager new] def Class post_hierarchy {{i 0}} { post %*s%s [expr $i*2] "" $self ! foreach sub $@subclasses {$sub post_hierarchy [expr $i+1]} } Thing post_hierarchy

1 0

pd/src s_inter.c,1.5.4.10.2.12,1.5.4.10.2.13
by Tim Blechmann 20 Apr '06

20 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12943/src Modified Files: Tag: devel_0_39 s_inter.c Log Message: don't microsleep shorter than 1ms on windoze! Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.12 retrieving revision 1.5.4.10.2.13 diff -C2 -d -r1.5.4.10.2.12 -r1.5.4.10.2.13 *** s_inter.c 30 Nov 2005 13:36:58 -0000 1.5.4.10.2.12 --- s_inter.c 19 Apr 2006 23:53:32 -0000 1.5.4.10.2.13 *************** *** 195,200 **** */ ! /* if (!sys_callbackscheduler && microsec < 1000) */ ! /* microsec = 1000; */ #ifndef MSW struct timeval timeout; --- 195,203 ---- */ ! if (!sys_callbackscheduler) ! if (500 < microsec && microsec < 1000) ! microsec = 1000; ! else ! return; #ifndef MSW struct timeval timeout; *************** *** 204,208 **** #else ! Sleep(microsec/1000); #endif --- 207,211 ---- #else ! Sleep(microsec/1000); #endif

1 0

externals/postlude/flib/src cc~.c, NONE, 1.1 flib.c, 1.2, 1.3 flib.h, 1.3, 1.4
by Jamie Bullock 19 Apr '06

19 Apr '06

Update of /cvsroot/pure-data/externals/postlude/flib/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6335/src Modified Files: flib.c flib.h Added Files: cc~.c Log Message: renamed cross~ to cc~ Index: flib.c =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/src/flib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flib.c 7 Apr 2006 10:30:43 -0000 1.2 --- flib.c 19 Apr 2006 18:00:40 -0000 1.3 *************** *** 37,41 **** int i; ! char *ext[] = {"sc~\t\tSpectral Centroid", "ss~\t\tSpectral Smoothness", "irreg~\t\tSpectral Irregularity (methods 1 and 2)", "mspec~\t\tMagnitude Spectrum", "peak~\t\tAmplitude and Frequency of Spectral Peaks", "pspec~\t\tPhase Spectrum", "sfm~\t\tSpectral Flatness Measure", "trist~\t\tTristimulus (x,y,z)", "++~\t\tSum of the samples in each block", "bmax~\t\tThe maximum value and location(s) each block", "melf~\t\tGenerate a mel spaced filter for fft", "clean~\t\tRemoves NaN, inf and -inf from a signal vector", "wdv~\t\tCalculate a wavelet dispersion vector (requires creb)", "hca~\t\tHarmonic component analysis", "cross~\t\tCross correlation"}; sc_tilde_setup(); ss_tilde_setup(); --- 37,41 ---- int i; ! char *ext[] = {"sc~\t\tSpectral Centroid", "ss~\t\tSpectral Smoothness", "irreg~\t\tSpectral Irregularity (methods 1 and 2)", "mspec~\t\tMagnitude Spectrum", "peak~\t\tAmplitude and Frequency of Spectral Peaks", "pspec~\t\tPhase Spectrum", "sfm~\t\tSpectral Flatness Measure", "trist~\t\tTristimulus (x,y,z)", "++~\t\tSum of the samples in each block", "bmax~\t\tThe maximum value and location(s) each block", "melf~\t\tGenerate a mel spaced filter for fft", "clean~\t\tRemoves NaN, inf and -inf from a signal vector", "wdv~\t\tCalculate a wavelet dispersion vector (requires creb)", "hca~\t\tHarmonic component analysis", "cc~\t\tCross correlation"}; sc_tilde_setup(); ss_tilde_setup(); *************** *** 52,56 **** wdv_tilde_setup(); hca_tilde_setup(); ! cross_tilde_setup(); post("\n\tflib "VERSION" Feature Extraction Library\n\tby Jamie Bullock\n"); --- 52,56 ---- wdv_tilde_setup(); hca_tilde_setup(); ! cc_tilde_setup(); post("\n\tflib "VERSION" Feature Extraction Library\n\tby Jamie Bullock\n"); Index: flib.h =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/src/flib.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** flib.h 19 Apr 2006 17:48:38 -0000 1.3 --- flib.h 19 Apr 2006 18:00:40 -0000 1.4 *************** *** 38,41 **** void wdv_tilde_setup(void); void hca_tilde_setup(void); ! void cross_tilde_setup(void); --- 38,41 ---- void wdv_tilde_setup(void); void hca_tilde_setup(void); ! void cc_tilde_setup(void); --- NEW FILE: cc~.c --- /* flib - PD library for feature extraction Copyright (C) 2005 Jamie Bullock 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; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /*Calculate the cross correlation of two signal vectors*/ /*The time domain implementation is based on code by Phil Bourke * the frequency domain version is based on code by Charles Henry * * Specify a time delay as an argument for the time domain implemenation, for example an argument of 32 will give the correlation coefficients for delays from -32 to 32 samples between the two input vectors * * Specify an argument of 'f' for the frequency domain implementation*/ #include "flib.h" #define SQ(a) (a * a) static t_class *cross_class; typedef struct _cross { t_object x_obj; t_float f; t_int delay; t_int is_freq_domain; } t_cross; static t_int *cross_perform_time_domain(t_int *w) { t_sample *x = (t_sample *)(w[1]); t_sample *y = (t_sample *)(w[2]); t_sample *out = (t_sample *)(w[3]); t_int N = (t_int)(w[4]), i, j, delay; t_int maxdelay = (t_int)(w[5]); t_float mx, my, sx, sy, sxy, denom, r; if(maxdelay > N * .5){ maxdelay = N * .5; post("cross~: invalid maxdelay, must be <= blocksize/2"); } /* Calculate the mean of the two series x[], y[] */ mx = 0; my = 0; for (i=0;i<N;i++) { mx += x[i]; my += y[i]; } mx /= N; my /= N; /* Calculate the denominator */ sx = 0; sy = 0; for (i=0;i<N;i++) { sx += (x[i] - mx) * (x[i] - mx); sy += (y[i] - my) * (y[i] - my); } denom = sqrt(sx*sy); /* Calculate the correlation series */ for (delay=-maxdelay;delay<maxdelay;delay++) { sxy = 0; for (i=0;i<N;i++) { j = i + delay; /* circular correlation */ while (j < 0) j += N; j %= N; sxy += (x[i] - mx) * (y[j] - my); } r = sxy / denom; *out++ = r; /* r is the correlation coefficient at "delay" */ } return (w+6); } t_int *cross_perform_freq_domain(t_int *w) { t_cross *x = (t_cross *)(w[1]); t_sample *sig1 = (t_sample *)(w[2]); t_sample *sig2 = (t_sample *)(w[3]); t_sample *out = (t_sample *)(w[4]); long int size = (long int) w[5]; long int k = size/2; float *expsig1 = NULL; float *revsig2 = NULL; float temp, temp2; long int i=0; int well_defined=1; int qtr, thrqtr; // The two signals are created, nonzero on 0 to N/4 and 3N/4 to N // This will be revised expsig1=(float *) alloca(size*sizeof(float)); revsig2=(float *) alloca(size*sizeof(float)); qtr = size/4; thrqtr = 3*size/4; for (i=0; i < qtr ; i++) { expsig1[i]=sig1[i]; revsig2[i]=0; } for (i=qtr; i < thrqtr ; i++) { expsig1[i]=sig1[i]; revsig2[i]=sig2[size-i]; } for (i=thrqtr; i < size ; i++) { expsig1[i]=sig1[i]; revsig2[i]=0; } mayer_realfft(size, expsig1); mayer_realfft(size, revsig2); expsig1[0]*=revsig2[0]; expsig1[k]*=revsig2[k]; for(i=1; i < k; i++) { temp=expsig1[i]; temp2=expsig1[size-i]; expsig1[i]=temp*revsig2[i]-temp2*revsig2[size-i]; expsig1[size-i]=temp*revsig2[size-i]+temp2*revsig2[i]; } mayer_realifft(size, expsig1); for(i=0; i < size; i++) { out[i]=expsig1[i]; } return(w+6); } static void cross_dsp(t_cross *x, t_signal **sp) { if(!x->is_freq_domain) dsp_add(cross_perform_time_domain, 5, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[0]->s_n, x->delay); else dsp_add(cross_perform_freq_domain, 5, x, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[0]->s_n); } static void *cross_new(t_symbol *s, t_int argc, t_atom *argv) { t_cross *x = (t_cross *)pd_new(cross_class); if(atom_getsymbol(argv) == gensym("f")){ x->is_freq_domain = 1; post("flib: cross: Frequency domain selected"); } else { x->delay = atom_getfloat(argv); post("flib: cross: Time domain selected"); } inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); outlet_new(&x->x_obj, &s_signal); return (void *)x; } void cross_tilde_setup(void) { cross_class = class_new(gensym("cross~"), (t_newmethod)cross_new, 0, sizeof(t_cross), CLASS_DEFAULT, A_GIMME, 0); class_addmethod(cross_class, (t_method)cross_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(cross_class, t_cross,f); class_sethelpsymbol(cross_class, gensym("help-flib")); }

1 0

externals/postlude/flib makefile,1.3,1.4
by Jamie Bullock 19 Apr '06

19 Apr '06

Update of /cvsroot/pure-data/externals/postlude/flib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6335 Modified Files: makefile Log Message: renamed cross~ to cc~ Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile 19 Apr 2006 17:48:37 -0000 1.3 --- makefile 19 Apr 2006 18:00:39 -0000 1.4 *************** *** 13,17 **** PDDIR = $(INSTALL_PREFIX)$(PDLIBDIR) ! TARGETS = sc~ ss~ irreg~ mspec~ peak~ pspec~ sfm~ trist~ pp~ bmax~ melf~ clean~ wdv~ hca~ cross~ --- 13,17 ---- PDDIR = $(INSTALL_PREFIX)$(PDLIBDIR) ! TARGETS = sc~ ss~ irreg~ mspec~ peak~ pspec~ sfm~ trist~ pp~ bmax~ melf~ clean~ wdv~ hca~ cc~ *************** *** 54,58 **** $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/wdv~.c $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/hca~.c ! $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/cross~.c $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $(NAME).obj $(PDNTOBJECTS) $(PDNTLIB) --- 54,58 ---- $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/wdv~.c $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/hca~.c ! $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) -c src/cc~.c $(CC) $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $(NAME).obj $(PDNTOBJECTS) $(PDNTLIB) *************** *** 90,94 **** $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/wdv~.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/hca~.c ! $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/cross~.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $(NAME).pd_darwin $(NAME).o $(DARWINOBJECTS) --- 90,94 ---- $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/wdv~.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/hca~.c ! $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/cc~.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $(NAME).pd_darwin $(NAME).o $(DARWINOBJECTS) *************** *** 148,152 **** $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/wdv~.c $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/hca~.c ! $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/cross~.c $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c ld -export_dynamic -shared -o $(NAME).pd_linux $(NAME).o $(LINUXOBJECTS) -lc -lm --- 148,152 ---- $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/wdv~.c $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/hca~.c ! $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c src/cc~.c $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c ld -export_dynamic -shared -o $(NAME).pd_linux $(NAME).o $(LINUXOBJECTS) -lc -lm *************** *** 180,184 **** $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c ! $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cross~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c ld -elf -shared -rdata_shared -o $(NAME).pd_irix5 $(NAME).o $(LINUXOBJECTS) -lm -lc --- 180,184 ---- $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c ! $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cc~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c ld -elf -shared -rdata_shared -o $(NAME).pd_irix5 $(NAME).o $(LINUXOBJECTS) -lm -lc *************** *** 213,217 **** $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c ! $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cross~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $(NAME).o $(LINUXOBJECTS) -lm -lc --- 213,217 ---- $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c ! $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cc~.c $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $(NAME).o $(LINUXOBJECTS) -lm -lc

1 0

externals/postlude/flib makefile,1.2,1.3
by Jamie Bullock 19 Apr '06

19 Apr '06

Update of /cvsroot/pure-data/externals/postlude/flib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28768 Modified Files: makefile Log Message: Added frequency domain correlation to cross~ Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile 7 Apr 2006 10:30:37 -0000 1.2 --- makefile 19 Apr 2006 17:48:37 -0000 1.3 *************** *** 1,5 **** ! # Makefile hacked together from various others, mostly the old zexy makefile I think. All credit to IOhannes Zmoelnig and anyone else who understands make better than me. # ! # Should work with Linux and OS X. No idea about Windows. NAME=flib --- 1,5 ---- ! # Makefile hacked together from various others, mostly the old zexy makefile and pique. All credit to IOhannes Zmoelnig, Miller Puckette and anyone else who understands make better than me. # ! # Should work with Linux and OS X. No idea about Windows and Irix. NAME=flib *************** *** 153,156 **** --- 153,221 ---- strip --strip-unneeded $(NAME).pd_linux + # ----------------------- IRIX 5.x ----------------------- + + pd_irix5: src/$(NAME).pd_irix5 + + .SUFFIXES: .pd_irix5 + + SGIOBJECTS = $(TARGETS:%=%.o) + + SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 + + SGIINCLUDE = -I/usr/include/ -I/usr/local/include/ + + .c.pd_irix5: + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/sc~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/ss~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/irreg~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/mspec~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/peak~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/pspec~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/sfm~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/trist~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/pp~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/bmax~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/melf~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/clean~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cross~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c + ld -elf -shared -rdata_shared -o $(NAME).pd_irix5 $(NAME).o $(LINUXOBJECTS) -lm -lc + rm $*.o + + # ----------------------- IRIX 6.x ----------------------- + + pd_irix6: src/$(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 + + SGIOBJECTS = $(TARGETS:%=%.o) + + SGIINCLUDE = -I/usr/include/ -I/usr/local/include/ + + .c.pd_irix6: + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/ss~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/irreg~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/mspec~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/peak~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/pspec~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/sfm~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/trist~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/pp~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/bmax~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/melf~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/clean~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/wdv~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/hca~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c src/cross~.c + $(CC) $(SGICFLAGS) $(SGIINCLUDE) -c $*.c + ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $(NAME).o $(LINUXOBJECTS) -lm -lc + rm $*.o + # ----------------------------------------------------------

1 0

[PD-cvs] externals/postlude/flib/src cross~.c, 1.3, 1.4 flib.h, 1.2, 1.3
by Jamie Bullock 19 Apr '06

19 Apr '06

Update of /cvsroot/pure-data/externals/postlude/flib/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28768/src Modified Files: cross~.c flib.h Log Message: Added frequency domain correlation to cross~ Index: flib.h =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/src/flib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flib.h 7 Apr 2006 20:11:49 -0000 1.2 --- flib.h 19 Apr 2006 17:48:38 -0000 1.3 *************** *** 22,26 **** #include <string.h> ! #define VERSION "0.8" void sc_tilde_setup(void); --- 22,26 ---- #include <string.h> ! #define VERSION "0.82" void sc_tilde_setup(void); Index: cross~.c =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/flib/src/cross~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cross~.c 7 Apr 2006 20:11:49 -0000 1.3 --- cross~.c 19 Apr 2006 17:48:38 -0000 1.4 *************** *** 18,23 **** ! /*Calculate the (non optimized) cross correlation of two signal vectors*/ ! /*Based on code by Phil Bourke */ --- 18,29 ---- ! /*Calculate the cross correlation of two signal vectors*/ ! ! /*The time domain implementation is based on code by Phil Bourke ! * the frequency domain version is based on code by Charles Henry ! * ! * Specify a time delay as an argument for the time domain implemenation, for example an argument of 32 will give the correlation coefficients for delays from -32 to 32 samples between the two input vectors ! * ! * Specify an argument of 'f' for the frequency domain implementation*/ *************** *** 31,37 **** t_float f; t_int delay; } t_cross; ! static t_int *cross_perform(t_int *w) { t_sample *x = (t_sample *)(w[1]); --- 37,44 ---- t_float f; t_int delay; + t_int is_freq_domain; } t_cross; ! static t_int *cross_perform_time_domain(t_int *w) { t_sample *x = (t_sample *)(w[1]); *************** *** 46,55 **** maxdelay = N * .5; post("cross~: invalid maxdelay, must be <= blocksize/2"); - } - else if (!maxdelay){ - maxdelay = N * .5; } ! /* Calculate the mean of the two series x[], y[] */ mx = 0; my = 0; --- 53,59 ---- maxdelay = N * .5; post("cross~: invalid maxdelay, must be <= blocksize/2"); } ! /* Calculate the mean of the two series x[], y[] */ mx = 0; my = 0; *************** *** 93,106 **** } static void cross_dsp(t_cross *x, t_signal **sp) { ! dsp_add(cross_perform, 5, ! sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[0]->s_n, x->delay); } ! static void *cross_new(t_floatarg f) { t_cross *x = (t_cross *)pd_new(cross_class); ! x->delay = (t_int)f; inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); outlet_new(&x->x_obj, &s_signal); --- 97,184 ---- } + + t_int *cross_perform_freq_domain(t_int *w) + { + t_cross *x = (t_cross *)(w[1]); + + t_sample *sig1 = (t_sample *)(w[2]); + t_sample *sig2 = (t_sample *)(w[3]); + t_sample *out = (t_sample *)(w[4]); + long int size = (long int) w[5]; + long int k = size/2; + float *expsig1 = NULL; + float *revsig2 = NULL; + float temp, temp2; + long int i=0; + int well_defined=1; + int qtr, thrqtr; + + // The two signals are created, nonzero on 0 to N/4 and 3N/4 to N + // This will be revised + + expsig1=(float *) alloca(size*sizeof(float)); + revsig2=(float *) alloca(size*sizeof(float)); + qtr = size/4; + thrqtr = 3*size/4; + for (i=0; i < qtr ; i++) + { + expsig1[i]=sig1[i]; + revsig2[i]=0; + } + for (i=qtr; i < thrqtr ; i++) + { + expsig1[i]=sig1[i]; + revsig2[i]=sig2[size-i]; + } + for (i=thrqtr; i < size ; i++) + { + expsig1[i]=sig1[i]; + revsig2[i]=0; + } + + mayer_realfft(size, expsig1); + mayer_realfft(size, revsig2); + expsig1[0]*=revsig2[0]; + expsig1[k]*=revsig2[k]; + for(i=1; i < k; i++) + { + temp=expsig1[i]; + temp2=expsig1[size-i]; + expsig1[i]=temp*revsig2[i]-temp2*revsig2[size-i]; + expsig1[size-i]=temp*revsig2[size-i]+temp2*revsig2[i]; + } + + mayer_realifft(size, expsig1); + for(i=0; i < size; i++) + { + out[i]=expsig1[i]; + } + + return(w+6); + + } + static void cross_dsp(t_cross *x, t_signal **sp) { ! if(!x->is_freq_domain) ! dsp_add(cross_perform_time_domain, 5, ! sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[0]->s_n, x->delay); ! else ! dsp_add(cross_perform_freq_domain, 5, x, ! sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[0]->s_n); } ! static void *cross_new(t_symbol *s, t_int argc, t_atom *argv) { t_cross *x = (t_cross *)pd_new(cross_class); ! ! if(atom_getsymbol(argv) == gensym("f")){ ! x->is_freq_domain = 1; ! post("flib: cross: Frequency domain selected"); ! } ! else { ! x->delay = atom_getfloat(argv); ! post("flib: cross: Time domain selected"); ! } inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); outlet_new(&x->x_obj, &s_signal); *************** *** 113,117 **** (t_newmethod)cross_new, 0, sizeof(t_cross), ! CLASS_DEFAULT, A_DEFFLOAT, 0); class_addmethod(cross_class, --- 191,195 ---- (t_newmethod)cross_new, 0, sizeof(t_cross), ! CLASS_DEFAULT, A_GIMME, 0); class_addmethod(cross_class,

1 0

externals/grill/pool/source main.cpp,1.14,1.15
by Thomas Grill 19 Apr '06

19 Apr '06

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22304/source Modified Files: main.cpp Log Message: fixed double-free on clearing values and dirs reintroduced missing help message Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.cpp 14 Dec 2005 01:53:01 -0000 1.14 --- main.cpp 19 Apr 2006 17:40:18 -0000 1.15 *************** *** 40,44 **** // print some help message ! static V m_help() { post("pool " POOL_VERSION " - hierarchical storage object, (C)2002-2005 Thomas Grill"); } // clear all data in pool --- 40,44 ---- // print some help message ! static V m_help() { post("pool " POOL_VERSION " - hierarchical storage object, (C)2002-2006 Thomas Grill"); } // clear all data in pool

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
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 April 2006