aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormusil <tmusil@users.sourceforge.net>2006-11-30 10:26:13 +0000
committermusil <tmusil@users.sourceforge.net>2006-11-30 10:26:13 +0000
commit373152cf9a1ec58916afc0c39c2f5a5bf61c8cec (patch)
treeb77e72e1404767a397d19d91dec83029203fef1d
parenta1e92bd8ad513384243b67af4a44dab8744515d9 (diff)
little nothings
svn path=/trunk/externals/iem/iem_delay/; revision=6535
-rw-r--r--src/block_delay~.c2
-rw-r--r--src/iemlib.h2
-rw-r--r--src/makefile3
-rw-r--r--src/makefile_linux3
-rw-r--r--src/makefile_win6
-rw-r--r--src/n_delay1p_line~.c2
-rw-r--r--src/n_delay2p_line~.c2
-rw-r--r--src/nz~.c41
8 files changed, 28 insertions, 33 deletions
diff --git a/src/block_delay~.c b/src/block_delay~.c
index d80f96b..ca20655 100644
--- a/src/block_delay~.c
+++ b/src/block_delay~.c
@@ -120,5 +120,5 @@ void block_delay_tilde_setup(void)
sizeof(t_block_delay_tilde), 0, 0);
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~"));
+ class_sethelpsymbol(block_delay_tilde_class, gensym("iemhelp2/block_delay~-help"));
}
diff --git a/src/iemlib.h b/src/iemlib.h
index 6be2de0..36d47ca 100644
--- a/src/iemlib.h
+++ b/src/iemlib.h
@@ -1,7 +1,7 @@
/* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution.
-iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005 */
+iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */
#ifndef __IEMLIB_H__
#define __IEMLIB_H__
diff --git a/src/makefile b/src/makefile
index d551c0c..24a337c 100644
--- a/src/makefile
+++ b/src/makefile
@@ -33,12 +33,13 @@ OBJ = $(SRC:.c=.o)
#
clean:
- rm $(TARGET)
+ rm ../$(TARGET)
rm *.o
all: $(OBJ)
@echo :: $(OBJ)
$(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+ mv $(TARGET) ..
strip --strip-unneeded $(TARGET)
$(OBJ) : %.o : %.c
diff --git a/src/makefile_linux b/src/makefile_linux
index d551c0c..24a337c 100644
--- a/src/makefile_linux
+++ b/src/makefile_linux
@@ -33,12 +33,13 @@ OBJ = $(SRC:.c=.o)
#
clean:
- rm $(TARGET)
+ rm ../$(TARGET)
rm *.o
all: $(OBJ)
@echo :: $(OBJ)
$(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+ mv $(TARGET) ..
strip --strip-unneeded $(TARGET)
$(OBJ) : %.o : %.c
diff --git a/src/makefile_win b/src/makefile_win
index 2d84b91..e65a76e 100644
--- a/src/makefile_win
+++ b/src/makefile_win
@@ -1,5 +1,5 @@
-all: iem_delay.dll
+all: ..\iem_delay.dll
VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
@@ -33,9 +33,9 @@ OBJ = $(SRC:.c=.obj)
.c.obj:
cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
-iem_delay.dll: $(OBJ)
+..\iem_delay.dll: $(OBJ)
link $(PD_WIN_L_FLAGS) /dll /export:iem_delay_setup \
- /out:iem_delay.dll $(OBJ) $(PD_WIN_LIB)
+ /out:..\iem_delay.dll $(OBJ) $(PD_WIN_LIB)
clean:
del *.obj
diff --git a/src/n_delay1p_line~.c b/src/n_delay1p_line~.c
index f65d149..4493af8 100644
--- a/src/n_delay1p_line~.c
+++ b/src/n_delay1p_line~.c
@@ -424,5 +424,5 @@ void n_delay1p_line_tilde_setup(void)
class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_dsp, gensym("dsp"), 0);
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~"));
+ class_sethelpsymbol(n_delay1p_line_tilde_class, gensym("iemhelp2/n_delay1p_line~-help"));
}
diff --git a/src/n_delay2p_line~.c b/src/n_delay2p_line~.c
index f747b65..084d765 100644
--- a/src/n_delay2p_line~.c
+++ b/src/n_delay2p_line~.c
@@ -458,5 +458,5 @@ void n_delay2p_line_tilde_setup(void)
class_addmethod(n_delay2p_line_tilde_class, (t_method)n_delay2p_line_tilde_dsp, gensym("dsp"), 0);
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~"));
+ class_sethelpsymbol(n_delay2p_line_tilde_class, gensym("iemhelp2/n_delay2p_line~-help"));
}
diff --git a/src/nz~.c b/src/nz~.c
index 110e3d9..a09fa03 100644
--- a/src/nz~.c
+++ b/src/nz~.c
@@ -59,9 +59,13 @@ static t_int *nz_tilde_perform(t_int *w)
t_float *readvec;
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++)
{
@@ -71,10 +75,6 @@ static t_int *nz_tilde_perform(t_int *w)
out[i] = readvec[i];
}
- 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)
x->x_writeindex -= x->x_mallocsize;
@@ -95,6 +95,7 @@ static t_int *nz_tilde_perf8(t_int *w)
t_float *readvec;
writevec2 = x->x_begmem2 + x->x_writeindex;
+ writevec1 = x->x_begmem1 + x->x_writeindex;
in = x->x_io[0];
i = n;
while(i)
@@ -108,7 +109,17 @@ static t_int *nz_tilde_perf8(t_int *w)
writevec2[6] = in[6];
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;
}
@@ -134,25 +145,6 @@ static t_int *nz_tilde_perf8(t_int *w)
}
}
- 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)
x->x_writeindex -= x->x_mallocsize;
@@ -170,6 +162,7 @@ static void nz_tilde_dsp(t_nz_tilde *x, t_signal **sp)
max_samps = x->x_max_delay_samples;
i = max_samps / n;
j = max_samps - i * n;
+ /* allocate memory as a multiple of blocksize */
if(j)
max_samps = (i+1) * n;
else
@@ -246,5 +239,5 @@ void nz_tilde_setup(void)
CLASS_MAINSIGNALIN(nz_tilde_class, t_nz_tilde, x_msi);
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~"));
+ class_sethelpsymbol(nz_tilde_class, gensym("iemhelp2/nz~-help"));
}