Pd-cvs September 2004

pd-cvs@lists.iem.at

9 participants
149 discussions

pd/src d_global.c,1.1.1.2.8.3,1.1.1.2.8.4
by Tim Blechmann 03 Sep '04

03 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv916 Modified Files: Tag: devel_0_37 d_global.c Log Message: loop unrolling for catch~, receive~ Index: d_global.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_global.c,v retrieving revision 1.1.1.2.8.3 retrieving revision 1.1.1.2.8.4 diff -C2 -d -r1.1.1.2.8.3 -r1.1.1.2.8.4 *** d_global.c 23 Jul 2004 08:46:40 -0000 1.1.1.2.8.3 --- d_global.c 3 Sep 2004 07:51:27 -0000 1.1.1.2.8.4 *************** *** 41,45 **** while (n--) { ! *out = (PD_BIGORSMALL(*in) ? 0 : *in); out++; in++; --- 41,45 ---- while (n--) { ! *out = (PD_BIGORSMALL(*in) ? 0 : *in); out++; in++; *************** *** 110,113 **** --- 110,139 ---- } + /* tb: vectorized receive function */ + static t_int *sigreceive_perf8(t_int *w) + { + t_sigreceive *x = (t_sigreceive *)(w[1]); + t_float *out = (t_float *)(w[2]); + int n = (int)(w[3]); + t_float *in = x->x_wherefrom; + if (in) + { + for (; n; n -= 8, in += 8, out += 8) + { + out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3]; + out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7]; + } + } + else + { + for (; n; n -= 8, in += 8, out += 8) + { + out[0] = 0; out[1] = 0; out[2] = 0; out[3] = 0; + out[4] = 0; out[5] = 0; out[6] = 0; out[7] = 0; + } + } + return (w+4); + } + static void sigreceive_set(t_sigreceive *x, t_symbol *s) { *************** *** 140,145 **** { sigreceive_set(x, x->x_sym); ! dsp_add(sigreceive_perform, 3, ! x, sp[0]->s_vec, sp[0]->s_n); } } --- 166,175 ---- { sigreceive_set(x, x->x_sym); ! if(sp[0]->s_n&7) ! dsp_add(sigreceive_perform, 3, ! x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(sigreceive_perf8, 3, ! x, sp[0]->s_vec, sp[0]->s_n); } } *************** *** 190,197 **** } static void sigcatch_dsp(t_sigcatch *x, t_signal **sp) { if (x->x_n == sp[0]->s_n) ! dsp_add(sigcatch_perform, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n); else error("sigcatch %s: unexpected vector size", x->x_sym->s_name); } --- 220,249 ---- } + /* tb: vectorized catch function */ + static t_int *sigcatch_perf8(t_int *w) + { + t_float *in = (t_float *)(w[1]); + t_float *out = (t_float *)(w[2]); + int n = (int)(w[3]); + for (; n; n -= 8, in += 8, out += 8) + { + out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3]; + out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7]; + + in[0] = 0; in[1] = 0; in[2] = 0; in[3] = 0; + in[4] = 0; in[5] = 0; in[6] = 0; in[7] = 0; + } + return (w+4); + } + static void sigcatch_dsp(t_sigcatch *x, t_signal **sp) { if (x->x_n == sp[0]->s_n) ! { ! if(sp[0]->s_n&7) ! dsp_add(sigcatch_perform, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(sigcatch_perf8, 3, x->x_vec, sp[0]->s_vec, sp[0]->s_n); ! } else error("sigcatch %s: unexpected vector size", x->x_sym->s_name); }

1 0

pd/src d_ctl.c,1.1.1.3.2.8,1.1.1.3.2.9
by Tim Blechmann 03 Sep '04

03 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv822 Modified Files: Tag: devel_0_37 d_ctl.c Log Message: improvement for line~ and vectorizing Index: d_ctl.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ctl.c,v retrieving revision 1.1.1.3.2.8 retrieving revision 1.1.1.3.2.9 diff -C2 -d -r1.1.1.3.2.8 -r1.1.1.3.2.9 *** d_ctl.c 23 Jul 2004 08:46:40 -0000 1.1.1.3.2.8 --- d_ctl.c 3 Sep 2004 07:50:40 -0000 1.1.1.3.2.9 *************** *** 135,140 **** else { ! x->x_value = x->x_target; ! while (n--) *out++ = x->x_value; } return (w+4); --- 135,180 ---- else { ! float g = x->x_value = x->x_target; ! while (n--) ! *out++ = g; ! } ! return (w+4); ! } ! ! /* TB: vectorized version */ ! static t_int *line_tilde_perf8(t_int *w) ! { ! t_line *x = (t_line *)(w[1]); ! t_float *out = (t_float *)(w[2]); ! int n = (int)(w[3]); ! float f = x->x_value; ! ! if (PD_BIGORSMALL(f)) ! x->x_value = f = 0; ! if (x->x_retarget) ! { ! int nticks = x->x_inletwas * x->x_dspticktomsec; ! if (!nticks) nticks = 1; ! x->x_ticksleft = nticks; ! x->x_biginc = (x->x_target - x->x_value)/(float)nticks; ! x->x_inc = x->x_1overn * x->x_biginc; ! x->x_retarget = 0; ! } ! if (x->x_ticksleft) ! { ! float f = x->x_value; ! while (n--) *out++ = f, f += x->x_inc; ! x->x_value += x->x_biginc; ! x->x_ticksleft--; ! } ! else ! { ! float f = x->x_value = x->x_target; ! for (; n; n -= 8, out += 8) ! { ! out[0] = f; out[1] = f; out[2] = f; out[3] = f; ! out[4] = f; out[5] = f; out[6] = f; out[7] = f; ! } ! } return (w+4); *************** *** 165,169 **** static void line_tilde_dsp(t_line *x, t_signal **sp) { ! dsp_add(line_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); x->x_1overn = 1./sp[0]->s_n; x->x_dspticktomsec = sp[0]->s_sr / (1000 * sp[0]->s_n); --- 205,212 ---- static void line_tilde_dsp(t_line *x, t_signal **sp) { ! if(sp[0]->s_n&7) ! dsp_add(line_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(line_tilde_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n); x->x_1overn = 1./sp[0]->s_n; x->x_dspticktomsec = sp[0]->s_sr / (1000 * sp[0]->s_n);

1 0

pd/src d_soundfile.c,1.1.1.2.2.21,1.1.1.2.2.22
by Tim Blechmann 03 Sep '04

03 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv325 Modified Files: Tag: devel_0_37 d_soundfile.c Log Message: removed debug messages if not in debug mode Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.1.1.2.2.21 retrieving revision 1.1.1.2.2.22 diff -C2 -d -r1.1.1.2.2.21 -r1.1.1.2.2.22 *** d_soundfile.c 2 Sep 2004 08:09:36 -0000 1.1.1.2.2.21 --- d_soundfile.c 3 Sep 2004 07:46:26 -0000 1.1.1.2.2.22 *************** *** 939,944 **** static t_sfqueue * soundfiler_queue; - #define DEBUG - #ifdef DEBUG #define SFDEBUG --- 939,942 ----

1 0

packages/darwin_app README,NONE,1.1 Makefile,1.3,1.4 TODO,1.1,1.2
by Hans-Christoph Steiner 02 Sep '04

02 Sep '04

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20143 Modified Files: Makefile TODO Added Files: README Log Message: fixed makefile version bug; generalized Wish Shell.app location --- NEW FILE: README --- To compile a standalone Pd.app, you need this stuff: Tcl/Tk Standalone .app 1. download TclTkAquaStandalone-8.?.?.dmg from http://tcltkaqua.sourceforge.net/ (I used 8.4.7) 2. mount the dmg 3. the Makefile will find what it needs in the mounted .dmg JackOSX 1. download latest JackOSX from http://www.jackosx.com/download.html (I used version 0.4.1) 2. install the .pkg 3. Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 31 Aug 2004 23:18:10 -0000 1.3 --- Makefile 2 Sep 2004 17:46:51 -0000 1.4 *************** *** 8,12 **** INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources ! WISH_SHELL_CONTENTS = /Applications/Utilities/Wish\ Shell.app/Contents PD_FILE_ROOT = $(DESTDIR)$(INSTALL_PREFIX)/lib/pd --- 8,17 ---- INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources ! # source for the Wish Shell.app used to build Pd ! # download TclTkAquaStandalone-8.?.?.dmg from http://tcltkaqua.sourceforge.net/ ! # and mount it. The files will be copied from the mounted .dmg image. ! #WISH_SHELL = /Applications/Utilities/Wish\ Shell.app ! WISH_SHELL = /Volumes/TclTkAquaStandalone-8.?.*/Wish\ Shell.app ! WISH_SHELL_CONTENTS = $(WISH_SHELL)/Contents PD_FILE_ROOT = $(DESTDIR)$(INSTALL_PREFIX)/lib/pd *************** *** 24,28 **** # release version for this distro ! PACKAGE_VERSION = beta3 PACKAGE_NAME = pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME) --- 29,33 ---- # release version for this distro ! PACKAGE_VERSION = beta4 PACKAGE_NAME = pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME) *************** *** 48,58 **** GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2) ! MAXLIB_VERSION = $(shell grep "#define VERSION" ../../externals/maxlib/maxlib.c | cut -d '"' -f 2) ! OSC_VERSION = $(shell grep "#define VERSION" ../../externals/OSCx/OSC.c | cut -d '"' -f 2) PDP_VERSION = $(shell grep PDP_VERSION= ../../externals/pdp/configure | cut -d '=' -f 2) ! PMPD_VERSION = $(shell grep "#define VERSION" ../../externals/pmpd/src/pmpd.c | cut -d '"' -f 2) TOXY_MAJOR_VERSION = $(shell grep TOXY_VERSION ../../externals/miXed/toxy/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) --- 53,63 ---- GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2) ! MAXLIB_VERSION = $(shell grep "define VERSION" ../../externals/maxlib/maxlib.c | cut -d '"' -f 2) ! OSC_VERSION = $(shell grep "define VERSION" ../../externals/OSCx/OSC.c | cut -d '"' -f 2) PDP_VERSION = $(shell grep PDP_VERSION= ../../externals/pdp/configure | cut -d '=' -f 2) ! PMPD_VERSION = $(shell grep "define VERSION" ../../externals/pmpd/src/pmpd.c | cut -d '"' -f 2) TOXY_MAJOR_VERSION = $(shell grep TOXY_VERSION ../../externals/miXed/toxy/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) *************** *** 64,68 **** ! darwin_app: darwin_app_wrapper darwin_app_core darwin_unix_pkg darwin_app_externals \ darwin_app_docs darwin_app_abstractions --- 69,73 ---- ! darwin_app: darwin_app_wrapper darwin_app_core darwin_app_externals \ darwin_app_docs darwin_app_abstractions *************** *** 113,119 **** # Makefile:308: *** unterminated call to function `shell': missing `)'. Stop. # ! # echo "<li>maxlib: $(MAXLIB_VERSION)" >> $(README_FILE) ! # echo "<li>osc: $(OSC_VERSION)" >> $(README_FILE) ! # echo "<li>pmpd: $(PMPD_VERSION)" >> $(README_FILE) echo "<li>pd-abstractions: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pd-doc: `date +20%y.%m.%d`" >> $(README_FILE) --- 118,124 ---- # Makefile:308: *** unterminated call to function `shell': missing `)'. Stop. # ! echo "<li>maxlib: $(MAXLIB_VERSION)" >> $(README_FILE) ! echo "<li>osc: $(OSC_VERSION)" >> $(README_FILE) ! echo "<li>pmpd: $(PMPD_VERSION)" >> $(README_FILE) echo "<li>pd-abstractions: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pd-doc: `date +20%y.%m.%d`" >> $(README_FILE) *************** *** 134,150 **** install -d "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -m0755 -p \ ! /Applications/Utilities/Wish\ Shell.app/Contents/MacOS/Wish\ Shell \ "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" install -m0644 -p \ ! /Applications/Utilities/Wish\ Shell.app/Contents/Resources/Wish\ Shell.rsrc \ "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks" ! cp -Rp \ ! /Applications/Utilities/Wish\ Shell.app/Contents/Frameworks \ ! "$(DESTDIR)$(PD_APP_CONTENTS)" ! cp -Rp \ ! /Applications/Utilities/Wish\ Shell.app/Contents/Frameworks \ ! "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks" \ --- 139,151 ---- install -d "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -m0755 -p \ ! $(WISH_SHELL_CONTENTS)/MacOS/Wish\ Shell \ "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" install -m0644 -p \ ! $(WISH_SHELL_CONTENTS)/Resources/Wish\ Shell.rsrc \ "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks" ! cp -Rp $(WISH_SHELL_CONTENTS)/Frameworks "$(DESTDIR)$(PD_APP_CONTENTS)" ! cp -Rp $(WISH_SHELL_CONTENTS)/Frameworks "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Frameworks" \ *************** *** 162,179 **** - # INSTALL_PREFIX=$(INSTALL_PREFIX) is for pd-MSP 0.37.1 - # prefix=$(INSTALL_PREFIX) is for pd-CVS 0.37 darwin_app_core: # apply some patches ! cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/socket.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/makefile.in.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/u_main.tk.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/configure.jackosx.patch ! cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/s_audio_jack.patch # pd core cd ../../pd/src/ && ./configure --enable-jack &&\ make install \ DESTDIR=../../packages/darwin_app/$(DESTDIR) \ ! INSTALL_PREFIX=$(INSTALL_PREFIX) darwin_app_docs: --- 163,184 ---- darwin_app_core: # apply some patches ! # with CVS version, next line causes: s_inter.c:645: error: parse error before "if" ! # cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/socket.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/makefile.in.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/u_main.tk.patch cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/configure.jackosx.patch ! # this patch isn't applied properly, so pd doesn't compile ! # cd ../../pd/src/ && patch -p0<../../packages/darwin_app/patches/s_audio_jack.patch # pd core cd ../../pd/src/ && ./configure --enable-jack &&\ make install \ DESTDIR=../../packages/darwin_app/$(DESTDIR) \ ! prefix=$(INSTALL_PREFIX) ! # The last line above needs to be changed based on which version ! # of the pd core source you are compiling: ! # INSTALL_PREFIX=$(INSTALL_PREFIX) is for pd-MSP 0.37.1 ! # prefix=$(INSTALL_PREFIX) is for pd-CVS 0.37 darwin_app_docs: *************** *** 211,215 **** #---------------------------------------------------------------------------- # FLEXT - cd ../../externals/grill/build/darwin && make install -d $(HELP_DIR)/tutorials --- 216,219 ---- Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 14 Aug 2004 15:22:18 -0000 1.1 --- TODO 2 Sep 2004 17:46:51 -0000 1.2 *************** *** 1,9 **** ! - change s_inter.c to use /Applications/Pd.app/Contents/MacOS/Wish\ Shell ! - AppMain.tcl: ! http://www.wordtech-software.com/tcl-bundle-tutorial.html ! http://wiki.tcl.tk/tclhttpd/3214 ! check WaveSurfer - include auto-.pdrc script in package somewhere... --- 1,6 ---- ! - fix socket.patch and s_audio_jack.patch ! - add context to all patches - include auto-.pdrc script in package somewhere...

1 0

pd/src m_simd_sse_gcc.c,1.1.2.4,1.1.2.5 m_simd_sse_vc.c,1.1.2.4,1.1.2.5
by Tim Blechmann 02 Sep '04

02 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12043 Modified Files: Tag: devel_0_37 m_simd_sse_gcc.c m_simd_sse_vc.c Log Message: fixed compile error with -DDONTUSESIMD Index: m_simd_sse_vc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_vc.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** m_simd_sse_vc.c 31 Aug 2004 11:09:39 -0000 1.1.2.4 --- m_simd_sse_vc.c 2 Sep 2004 14:23:01 -0000 1.1.2.5 *************** *** 7,11 **** #include "m_simd.h" ! #if defined(NT) && defined(_MSC_VER) t_int *zero_perf_sse_vc(t_int *w) --- 7,11 ---- #include "m_simd.h" ! #if defined(NT) && defined(_MSC_VER) && !(defined DONTUSESIMD) t_int *zero_perf_sse_vc(t_int *w) Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** m_simd_sse_gcc.c 31 Aug 2004 08:05:49 -0000 1.1.2.4 --- m_simd_sse_gcc.c 2 Sep 2004 14:23:01 -0000 1.1.2.5 *************** *** 7,11 **** #include "m_simd.h" ! #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) --- 7,11 ---- #include "m_simd.h" ! #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) && !(defined DONTUSESIMD)

1 0

pd/src g_array.c,1.1.1.3.2.9,1.1.1.3.2.10
by Tim Blechmann 02 Sep '04

02 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20843 Modified Files: Tag: devel_0_37 g_array.c Log Message: fixed array lock for msvc Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.9 retrieving revision 1.1.1.3.2.10 diff -C2 -d -r1.1.1.3.2.9 -r1.1.1.3.2.10 *** g_array.c 17 Jun 2004 21:03:54 -0000 1.1.1.3.2.9 --- g_array.c 2 Sep 2004 08:32:47 -0000 1.1.1.3.2.10 *************** *** 174,177 **** --- 174,182 ---- t_template *template; char *str; + + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + pthread_mutexattr_t mutex_attr; + #endif /* GARRAY_THREAD_LOCK */ + if (s == &s_) { *************** *** 224,228 **** #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ x->x_mutex=getbytes(sizeof(pthread_mutex_t)); - pthread_mutexattr_t mutex_attr; pthread_mutexattr_init (&mutex_attr); pthread_mutexattr_settype(&mutex_attr,PTHREAD_MUTEX_RECURSIVE); --- 229,232 ---- *************** *** 315,318 **** --- 319,323 ---- static void garray_free(t_garray *x) { + t_pd *x2; #ifdef GARRAY_THREAD_LOCK garray_lock(x);/* TB: thread lock */ *************** *** 320,324 **** freebytes(x->x_mutex,sizeof(pthread_mutex_t)); #endif - t_pd *x2; gfxstub_deleteforkey(x); pd_unbind(&x->x_gobj.g_pd, x->x_realname); --- 325,328 ---- *************** *** 852,859 **** t_template *garray_template(t_garray *x) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = template_findbyname(x->x_templatesym); #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_unlock(x); --- 856,864 ---- t_template *garray_template(t_garray *x) { + t_template *template; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = template_findbyname(x->x_templatesym); #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_unlock(x); *************** *** 881,890 **** int garray_getfloatarray(t_garray *x, int *size, t_float **vec) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! int yonset, type; ! t_symbol *arraytype; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 886,897 ---- int garray_getfloatarray(t_garray *x, int *size, t_float **vec) { + t_template *template; + int yonset, type; + t_symbol *arraytype; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 911,921 **** float garray_get(t_garray *x, t_symbol *s, t_int indx) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! int yonset, type; ! t_symbol *arraytype; ! float ret; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 918,930 ---- float garray_get(t_garray *x, t_symbol *s, t_int indx) { + t_template *template; + int yonset, type; + t_symbol *arraytype; + float ret; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! ! template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 953,962 **** static void garray_const(t_garray *x, t_floatarg g) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! int yonset, type, i; ! t_symbol *arraytype; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 962,972 ---- static void garray_const(t_garray *x, t_floatarg g) { + int yonset, type, i; + t_symbol *arraytype; + t_template *template; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 975,985 **** int nsin, t_float *vsin, int sineflag) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! t_template *template = garray_template(x); int yonset, type, i, j; t_symbol *arraytype; double phase, phaseincr, fj; if (npoints == 0) npoints = 512; /* dunno what a good default would be... */ --- 985,996 ---- int nsin, t_float *vsin, int sineflag) { ! t_template *template; int yonset, type, i, j; t_symbol *arraytype; double phase, phaseincr, fj; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + template = garray_template(x); if (npoints == 0) npoints = 512; /* dunno what a good default would be... */ *************** *** 1015,1025 **** static void garray_sinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! t_float *svec = (t_float *)t_getbytes(sizeof(t_float) * argc); ! int npoints, i; if (argc < 2) { --- 1026,1038 ---- static void garray_sinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + t_template *template; + t_float *svec; + int npoints, i; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = garray_template(x); ! svec = (t_float *)t_getbytes(sizeof(t_float) * argc); if (argc < 2) { *************** *** 1046,1056 **** static void garray_cosinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! ! t_float *svec = (t_float *)t_getbytes(sizeof(t_float) * argc); ! int npoints, i; if (argc < 2) { --- 1059,1070 ---- static void garray_cosinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + t_template *template; + t_float *svec; + int npoints, i; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = garray_template(x); ! svec = (t_float *)t_getbytes(sizeof(t_float) * argc); if (argc < 2) { *************** *** 1078,1088 **** static void garray_normalize(t_garray *x, t_float f) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! t_template *template = garray_template(x); int yonset, type, npoints, i; double maxv, renormer; t_symbol *arraytype; if (f <= 0) --- 1092,1103 ---- static void garray_normalize(t_garray *x, t_float f) { ! t_template *template; int yonset, type, npoints, i; double maxv, renormer; t_symbol *arraytype; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + template = garray_template(x); if (f <= 0) *************** *** 1123,1133 **** static void garray_list(t_garray *x, t_symbol *s, int argc, t_atom *argv) { #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! t_template *template = garray_template(x); ! int yonset, type, i; ! t_symbol *arraytype; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 1138,1149 ---- static void garray_list(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + t_template *template; + int yonset, type, i; + t_symbol *arraytype; #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ garray_lock(x); #endif ! template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 1240,1252 **** static void garray_read(t_garray *x, t_symbol *filename) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! int nelem = x->x_n, filedesc; FILE *fd; char buf[MAXPDSTRING], *bufptr; ! t_template *template = garray_template(x); int yonset, type, i; t_symbol *arraytype; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 1256,1270 ---- static void garray_read(t_garray *x, t_symbol *filename) { ! int nelem, filedesc; FILE *fd; char buf[MAXPDSTRING], *bufptr; ! t_template *template; int yonset, type, i; t_symbol *arraytype; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + nelem = x->x_n; + template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 1302,1309 **** t_symbol *endian, t_floatarg fskip) { - #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ - garray_lock(x); - #endif - int skip = fskip, filedesc; int i, nelem; --- 1320,1323 ---- *************** *** 1314,1317 **** --- 1328,1334 ---- int cpubig = garray_ambigendian(), swap = 0; char c = endian->s_name[0]; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif if (c == 'b') { *************** *** 1381,1393 **** static void garray_write(t_garray *x, t_symbol *filename) { - #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ - garray_lock(x); - #endif - FILE *fd; char buf[MAXPDSTRING]; ! t_template *template = garray_template(x); int yonset, type, i; t_symbol *arraytype; if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) --- 1398,1411 ---- static void garray_write(t_garray *x, t_symbol *filename) { FILE *fd; char buf[MAXPDSTRING]; ! t_template *template; int yonset, type, i; t_symbol *arraytype; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + + template = garray_template(x); if (!template_find_field(template, gensym("y"), &yonset, &type, &arraytype) || type != DT_FLOAT) *************** *** 1444,1452 **** static void garray_write16(t_garray *x, t_symbol *filename, t_symbol *format) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! ! t_template *template = garray_template(x); int yonset, type, i; t_symbol *arraytype; --- 1462,1466 ---- static void garray_write16(t_garray *x, t_symbol *filename, t_symbol *format) { ! t_template *template; int yonset, type, i; t_symbol *arraytype; *************** *** 1456,1459 **** --- 1470,1479 ---- int swap = garray_ambigendian(); /* wave is only little endian */ int intbuf; + + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + + template = garray_template(x); strncpy(filenamebuf, filename->s_name, MAXPDSTRING-10); filenamebuf[MAXPDSTRING-10] = 0; *************** *** 1537,1548 **** void garray_resize(t_garray *x, t_floatarg f) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! int was = x->x_n, elemsize; t_glist *gl; int dspwas; int n = f; char *nvec; if (n < 1) n = 1; --- 1557,1569 ---- void garray_resize(t_garray *x, t_floatarg f) { ! int was, elemsize; t_glist *gl; int dspwas; int n = f; char *nvec; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + was = x->x_n; if (n < 1) n = 1;

1 0

pd/src d_soundfile.c,1.1.1.2.2.20,1.1.1.2.2.21
by Tim Blechmann 02 Sep '04

02 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16754 Modified Files: Tag: devel_0_37 d_soundfile.c Log Message: oops Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.1.1.2.2.20 retrieving revision 1.1.1.2.2.21 diff -C2 -d -r1.1.1.2.2.20 -r1.1.1.2.2.21 *** d_soundfile.c 1 Sep 2004 13:23:11 -0000 1.1.1.2.2.20 --- d_soundfile.c 2 Sep 2004 08:09:36 -0000 1.1.1.2.2.21 *************** *** 21,30 **** #ifdef MSW #include <io.h> - #define read _read - #define write _write - #define lseek _lseek - #define close _close - #define open _open - #define fdopen _fdopen #endif #include <stdio.h> --- 21,24 ----

1 0

pd/src d_soundfile.c,1.1.1.2.2.19,1.1.1.2.2.20
by Tim Blechmann 01 Sep '04

01 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13913 Modified Files: Tag: devel_0_37 d_soundfile.c Log Message: fixed threaded soundfiler for msvc Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.1.1.2.2.19 retrieving revision 1.1.1.2.2.20 diff -C2 -d -r1.1.1.2.2.19 -r1.1.1.2.2.20 *** d_soundfile.c 23 Jul 2004 08:46:40 -0000 1.1.1.2.2.19 --- d_soundfile.c 1 Sep 2004 13:23:11 -0000 1.1.1.2.2.20 *************** *** 21,24 **** --- 21,30 ---- #ifdef MSW #include <io.h> + #define read _read + #define write _write + #define lseek _lseek + #define close _close + #define open _open + #define fdopen _fdopen #endif #include <stdio.h> *************** *** 919,923 **** typedef struct _sfprocess { ! void (* process) (t_soundfiler *,t_symbol *, int, t_atom *); /* function to call */ t_soundfiler * x; /* soundfiler */ --- 925,929 ---- typedef struct _sfprocess { ! void (* process) (t_soundfiler *,t_symbol *, int, t_atom *); /* function to call */ t_soundfiler * x; /* soundfiler */ *************** *** 928,932 **** } t_sfprocess; - /* this is the queue for all soundfiler objects */ typedef struct _sfqueue --- 934,937 ---- *************** *** 951,954 **** --- 956,960 ---- int argc, t_atom * argv) { + t_sfprocess * last_entry; /* preparing argument vector */ t_atom * largv = copybytes (argv, argc * sizeof(t_atom)); *************** *** 976,981 **** /* preparing entry */ ! t_sfprocess * last_entry=getbytes(sizeof(t_sfprocess)); ! pthread_mutex_init(&(last_entry->mutex), NULL); pthread_mutex_lock(&(last_entry->mutex)); last_entry->process=process; --- 982,988 ---- /* preparing entry */ ! last_entry = (t_sfprocess*)getbytes(sizeof(t_sfprocess)); ! ! pthread_mutex_init(&(last_entry->mutex), NULL); pthread_mutex_lock(&(last_entry->mutex)); last_entry->process=process; *************** *** 1028,1032 **** void soundfiler_thread(void) { ! while (1) { #ifdef DEBUG --- 1035,1042 ---- void soundfiler_thread(void) { ! t_sfprocess * me; ! t_int i; ! t_sfprocess * next; ! while (1) { #ifdef DEBUG *************** *** 1051,1055 **** /* create a copy that we can work on */ ! t_sfprocess * me = copybytes(soundfiler_queue->begin, sizeof(t_sfprocess)); --- 1061,1065 ---- /* create a copy that we can work on */ ! me = copybytes(soundfiler_queue->begin, sizeof(t_sfprocess)); *************** *** 1062,1066 **** #endif ! static int i; for (i = 0; i != me->argc; ++i) { --- 1072,1076 ---- #endif ! for (i = 0; i != me->argc; ++i) { *************** *** 1126,1130 **** /* the process struct */ ! t_sfprocess * next=soundfiler_queue->begin->next; freebytes(soundfiler_queue->begin,sizeof(t_sfprocess)); soundfiler_queue->begin=next; --- 1136,1140 ---- /* the process struct */ ! next=soundfiler_queue->begin->next; freebytes(soundfiler_queue->begin,sizeof(t_sfprocess)); soundfiler_queue->begin=next; *************** *** 1165,1169 **** void sys_start_sfthread(void) { ! //initialize queue soundfiler_queue = getbytes (sizeof(t_sfqueue)); --- 1175,1184 ---- void sys_start_sfthread(void) { ! pthread_attr_t sf_attr; ! struct sched_param sf_param; ! ! t_int status; ! ! //initialize queue soundfiler_queue = getbytes (sizeof(t_sfqueue)); *************** *** 1176,1182 **** // initialize thread - pthread_attr_t sf_attr; pthread_attr_init(&sf_attr); - struct sched_param sf_param; #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING --- 1191,1195 ---- *************** *** 1196,1200 **** //start thread ! int status = pthread_create(&sf_thread_id, &sf_attr, (void *) soundfiler_thread,NULL); if ( status !=0) --- 1209,1213 ---- //start thread ! status = pthread_create(&sf_thread_id, &sf_attr, (void *) soundfiler_thread,NULL); if ( status !=0) *************** *** 1398,1402 **** { pd_error(x, "resize failed"); - int j; for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ --- 1411,1414 ---- *************** *** 1424,1428 **** { pd_error(x, "resize failed"); - int j; for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ --- 1436,1439 ---- *************** *** 1651,1654 **** --- 1662,1671 ---- int argc, t_atom *argv) { + int was, elemsize; /* array contains was elements of size elemsize */ + t_float * vec; /* old array */ + t_glist *gl; + int dspwas; + int n; /* resize of n elements */ + char *nvec; /* new array */ t_garray * x = (t_garray *)pd_findbyclass(argv[0].a_w.w_symbol, garray_class); *************** *** 1661,1670 **** - int was, elemsize; /* array contains was elements of size elemsize */ - t_float * vec; /* old array */ - t_glist *gl; - int dspwas; - int n; /* resize of n elements */ - char *nvec; /* new array */ vec = (t_float*) x->x_array.a_vec; --- 1678,1681 ---- *************** *** 1773,1776 **** --- 1784,1794 ---- int argc, t_atom *argv) { + int size, elemsize; /* array contains was elements of size elemsize */ + t_float * vec; /* old array */ + t_glist *gl; + int dspwas; + int val; /* value */ + char *nvec; /* new array */ + int i; t_garray * x = (t_garray *)pd_findbyclass(argv[0].a_w.w_symbol, garray_class); *************** *** 1783,1792 **** - int size, elemsize; /* array contains was elements of size elemsize */ - t_float * vec; /* old array */ - t_glist *gl; - int dspwas; - int val; /* value */ - char *nvec; /* new array */ vec = (t_float*) x->x_array.a_vec; --- 1801,1804 ---- *************** *** 1821,1825 **** /* setting array */ - int i; for (i=0; i!=size; ++i) { --- 1833,1836 ----

1 0

packages/darwin_app/patches configure.jackosx.patch,NONE,1.1 makefile.in.patch,NONE,1.1 s_audio_jack.patch,NONE,1.1 socket.patch,NONE,1.1 u_main.tk.patch,NONE,1.1 unpatch,NONE,1.1
by gerard roma 01 Sep '04

01 Sep '04

Update of /cvsroot/pure-data/packages/darwin_app/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19487 Added Files: configure.jackosx.patch makefile.in.patch s_audio_jack.patch socket.patch u_main.tk.patch unpatch Log Message: macosx style app --- NEW FILE: configure.jackosx.patch --- Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.4 diff -r1.4 configure 5996c5996 < # support for jack, on either linux or darwin: --- > # support for jack on linux : 5999,6001c5999,6004 < MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" < SYSSRC=$SYSSRC" s_audio_jack.c" < LDFLAGS=$LDFLAGS" -lrt -ljack" --- > if test `uname -s` = Linux > then > MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" > SYSSRC=$SYSSRC" s_audio_jack.c" > LDFLAGS=$LDFLAGS" -lrt -ljack" > fi --- NEW FILE: makefile.in.patch --- Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.3 diff -r1.3 makefile.in 103,104c103,104 < /Library/Frameworks/Tk.framework/Versions/Current/Tk \ < /Library/Frameworks/Tcl.framework/Versions/Current/Tcl \ --- > /Applications/Utilities/Wish\ Shell.app/Contents/Frameworks/Tk.framework/Versions/Current/Tk \ > /Applications/Utilities/Wish\ Shell.app/Contents/Frameworks/Tcl.framework/Versions/Current/Tcl \ --- NEW FILE: u_main.tk.patch --- Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.3 diff -r1.3 u_main.tk 34,35c34,36 < set pd_guidir $pd_gui2/.. < load $pd_guidir/bin/pdtcl --- > # set pd_guidir $pd_gui2/.. > # load $pd_guidir/bin/pdtcl > loadpdtcl 340a342 > global tcl_platform 365,366c367,373 < $mbar.help add command -label {Pure Documentation...} \ < -command {menu_documentation} --- > if {$tcl_platform(os) != "Darwin"} { > $mbar.help add command -label {Pure Documentation...} \ > -command {menu_documentation} > } else { > $mbar.help add command -label {Pure Documentation...} \ > -command {menu_doc_open doc/menus doc-menu.pd} > } --- NEW FILE: s_audio_jack.patch --- Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.4 diff -r1.4 s_audio_jack.c 43c43,45 < --- > #ifdef MACOSX > jack_out_max = nframes; > #else 45a48 > #endif --- NEW FILE: unpatch --- cd ../../../pd/src rm s_inter.c makefile.in u_main.tk s_audio_jack.c configure cvs update s_inter.c makefile.in u_main.tk s_audio_jack.c configure --- NEW FILE: socket.patch --- Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.4 diff -r1.4 s_inter.c 643a644,648 > #ifdef MACOSX > if (setsockopt(xsock, SOL_SOCKET, SO_REUSEADDR, > &intarg, sizeof(intarg)) < 0) > post("setsockopt (SO_REUSEADDR) failed\n"); > #endif

1 0

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 September 2004