Update of /cvsroot/pure-data/externals/iem/iem_delay/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9574/iem/iem_delay/src
Modified Files: block_delay~.c iemlib.h makefile makefile_linux makefile_win n_delay1p_line~.c n_delay2p_line~.c nz~.c Log Message: little nothings
Index: makefile_linux =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/makefile_linux,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile_linux 29 Nov 2006 19:20:43 -0000 1.1 --- makefile_linux 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 34,38 ****
clean: ! rm $(TARGET) rm *.o
--- 34,38 ----
clean: ! rm ../$(TARGET) rm *.o
*************** *** 40,43 **** --- 40,44 ---- @echo :: $(OBJ) $(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB) + mv $(TARGET) .. strip --strip-unneeded $(TARGET)
Index: n_delay2p_line~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/n_delay2p_line~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n_delay2p_line~.c 29 Nov 2006 19:20:43 -0000 1.1 --- n_delay2p_line~.c 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 459,462 **** class_addmethod(n_delay2p_line_tilde_class, (t_method)n_delay2p_line_tilde_stop, gensym("stop"), 0); class_addmethod(n_delay2p_line_tilde_class, (t_method)n_delay2p_line_tilde_time, gensym("time"), A_FLOAT, 0); ! class_sethelpsymbol(n_delay2p_line_tilde_class, gensym("iemhelp2/help-n_delay2p_line~")); } --- 459,462 ---- class_addmethod(n_delay2p_line_tilde_class, (t_method)n_delay2p_line_tilde_stop, gensym("stop"), 0); class_addmethod(n_delay2p_line_tilde_class, (t_method)n_delay2p_line_tilde_time, gensym("time"), A_FLOAT, 0); ! class_sethelpsymbol(n_delay2p_line_tilde_class, gensym("iemhelp2/n_delay2p_line~-help")); }
Index: nz~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/nz~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nz~.c 29 Nov 2006 19:20:43 -0000 1.1 --- nz~.c 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 60,66 **** --- 60,70 ----
writevec2 = x->x_begmem2 + x->x_writeindex; + writevec1 = x->x_begmem1 + x->x_writeindex; in = x->x_io[0]; for(i=0; i<n; i++) + { writevec2[i] = in[i]; + writevec1[i] = in[i]; + }
for(j=0; j<num_dels; j++) *************** *** 72,79 **** }
- writevec1 = x->x_begmem1 + x->x_writeindex; - for(i=0; i<n; i++) - writevec1[i] = writevec2[i]; - x->x_writeindex += n; if(x->x_writeindex >= x->x_mallocsize) --- 76,79 ---- *************** *** 96,99 **** --- 96,100 ----
writevec2 = x->x_begmem2 + x->x_writeindex; + writevec1 = x->x_begmem1 + x->x_writeindex; in = x->x_io[0]; i = n; *************** *** 109,113 **** --- 110,124 ---- writevec2[7] = in[7];
+ writevec1[0] = in[0]; + writevec1[1] = in[1]; + writevec1[2] = in[2]; + writevec1[3] = in[3]; + writevec1[4] = in[4]; + writevec1[5] = in[5]; + writevec1[6] = in[6]; + writevec1[7] = in[7]; + writevec2 += 8; + writevec1 += 8; in += 8; i -= 8; *************** *** 135,157 **** }
- writevec1 = x->x_begmem1 + x->x_writeindex; - writevec2 = x->x_begmem2 + x->x_writeindex; - i = n; - while(i) - { - writevec1[0] = writevec2[0]; - writevec1[1] = writevec2[1]; - writevec1[2] = writevec2[2]; - writevec1[3] = writevec2[3]; - writevec1[4] = writevec2[4]; - writevec1[5] = writevec2[5]; - writevec1[6] = writevec2[6]; - writevec1[7] = writevec2[7]; - - writevec1 += 8; - writevec2 += 8; - i -= 8; - } - x->x_writeindex += n; if(x->x_writeindex >= x->x_mallocsize) --- 146,149 ---- *************** *** 171,174 **** --- 163,167 ---- i = max_samps / n; j = max_samps - i * n; + /* allocate memory as a multiple of blocksize */ if(j) max_samps = (i+1) * n; *************** *** 247,250 **** class_addlist(nz_tilde_class, (t_method)nz_tilde_list); class_addmethod(nz_tilde_class, (t_method)nz_tilde_dsp, gensym("dsp"), 0); ! class_sethelpsymbol(nz_tilde_class, gensym("iemhelp2/help-nz~")); } --- 240,243 ---- class_addlist(nz_tilde_class, (t_method)nz_tilde_list); class_addmethod(nz_tilde_class, (t_method)nz_tilde_dsp, gensym("dsp"), 0); ! class_sethelpsymbol(nz_tilde_class, gensym("iemhelp2/nz~-help")); }
Index: makefile_win =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/makefile_win,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile_win 29 Nov 2006 19:20:43 -0000 1.1 --- makefile_win 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 1,4 ****
! all: iem_delay.dll
VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" --- 1,4 ----
! all: ..\iem_delay.dll
VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" *************** *** 34,40 **** cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
! iem_delay.dll: $(OBJ) link $(PD_WIN_L_FLAGS) /dll /export:iem_delay_setup \ ! /out:iem_delay.dll $(OBJ) $(PD_WIN_LIB)
clean: --- 34,40 ---- cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
! ..\iem_delay.dll: $(OBJ) link $(PD_WIN_L_FLAGS) /dll /export:iem_delay_setup \ ! /out:..\iem_delay.dll $(OBJ) $(PD_WIN_LIB)
clean:
Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 29 Nov 2006 19:20:43 -0000 1.1 --- makefile 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 34,38 ****
clean: ! rm $(TARGET) rm *.o
--- 34,38 ----
clean: ! rm ../$(TARGET) rm *.o
*************** *** 40,43 **** --- 40,44 ---- @echo :: $(OBJ) $(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB) + mv $(TARGET) .. strip --strip-unneeded $(TARGET)
Index: iemlib.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/iemlib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iemlib.h 29 Nov 2006 19:20:43 -0000 1.1 --- iemlib.h 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 2,6 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution.
! iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005 */
#ifndef __IEMLIB_H__ --- 2,6 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution.
! iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */
#ifndef __IEMLIB_H__
Index: block_delay~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/block_delay~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** block_delay~.c 29 Nov 2006 19:20:43 -0000 1.1 --- block_delay~.c 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 121,124 **** CLASS_MAINSIGNALIN(block_delay_tilde_class, t_block_delay_tilde, x_msi); class_addmethod(block_delay_tilde_class, (t_method)block_delay_tilde_dsp, gensym("dsp"), 0); ! class_sethelpsymbol(block_delay_tilde_class, gensym("iemhelp2/help-block_delay~")); } --- 121,124 ---- CLASS_MAINSIGNALIN(block_delay_tilde_class, t_block_delay_tilde, x_msi); class_addmethod(block_delay_tilde_class, (t_method)block_delay_tilde_dsp, gensym("dsp"), 0); ! class_sethelpsymbol(block_delay_tilde_class, gensym("iemhelp2/block_delay~-help")); }
Index: n_delay1p_line~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_delay/src/n_delay1p_line~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n_delay1p_line~.c 29 Nov 2006 19:20:43 -0000 1.1 --- n_delay1p_line~.c 30 Nov 2006 10:26:13 -0000 1.2 *************** *** 425,428 **** class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_stop, gensym("stop"), 0); class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_time, gensym("time"), A_FLOAT, 0); ! class_sethelpsymbol(n_delay1p_line_tilde_class, gensym("iemhelp2/help-n_delay1p_line~")); } --- 425,428 ---- class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_stop, gensym("stop"), 0); class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_time, gensym("time"), A_FLOAT, 0); ! class_sethelpsymbol(n_delay1p_line_tilde_class, gensym("iemhelp2/n_delay1p_line~-help")); }