Commit 5f1c57e2 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-release_2.15.2' into master

parents b35182df 1983b16e
......@@ -6,18 +6,18 @@
lib.name = zexy
make-lib-executable=yes
make-lib-executable=no
with-regex=yes
with-lpt=yes
# input source file (class name == source file basename)
class.sources = \
src/0x260x260x7e.c \
src/0x260x26_tilde.c \
src/0x2e.c \
src/0x3c0x7e.c \
src/0x3d0x3d0x7e.c \
src/0x3e0x7e.c \
src/0x7c0x7c0x7e.c \
src/0x3c_tilde.c \
src/0x3d0x3d_tilde.c \
src/0x3e_tilde.c \
src/0x7c0x7c_tilde.c \
src/a2l.c \
src/abs~.c \
src/absgn~.c \
......
......@@ -48,7 +48,7 @@ be flushed when a new package arrives or not.;
#X obj 35 335 drip 200 flush;
#X obj 171 335 drip 200;
#X text 717 13 part of;
#X obj 776 13 zexy;
#X text 776 13 zexy;
#N canvas 460 154 494 344 META 0;
#X text 12 145 HELP_PATCH_AUTHORS "pd meta" information added by Jonathan
Wilkes for Pd version 0.42.;
......
......@@ -27,7 +27,7 @@ eat your memory.;
#X msg 201 159 info;
#X text 247 158 query the number of arguments in the LIFO;
#X obj 156 209 print info;
#X obj 533 30 zexy;
#X text 533 30 zexy;
#N canvas 593 163 494 344 META 0;
#X text 12 165 HELP_PATCH_AUTHORS "pd meta" information added by Jonathan
Wilkes for Pd version 0.42.;
......
#N canvas 0 31 568 508 10;
#X text 471 31 part of;
#X obj 533 30 zexy;
#X text 533 30 zexy;
#X obj 58 192 lifop;
#X msg 58 85 1 2 3 4 5;
#X msg 69 110 list a list;
......
#N canvas 0 31 778 668 10;
#X text 625 11 part of;
#X obj 700 10 zexy;
#X text 700 10 zexy;
#X obj 183 223 print x1;
#X obj 261 223 print x2;
#X obj 339 223 print x3;
......
......@@ -245,13 +245,13 @@ static void andand_tilde_dsp(t_andand_tilde *UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(andand_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(andand_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(andand_tilde_perform, 4, in1, in2, out, n);
dsp_add(andand_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(andand_tilde_perf8, 4, in1, in2, out, n);
dsp_add(andand_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -268,13 +268,13 @@ static void scalarandand_tilde_dsp(t_scalarandand_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalarandand_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalarandand_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalarandand_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......@@ -283,7 +283,7 @@ static void andand_tilde_help(t_object* UNUSED(x))
post("\n"HEARTSYMBOL " &&~\t\t:: logical AND operation on 2 signals");
}
ZEXY_SETUP void setup_0x260x260x7e(void)
ZEXY_SETUP void setup_0x260x26_tilde(void)
{
andand_tilde_class = zexy_new("&&~",
andand_tilde_new, 0, t_andand_tilde, 0, "*");
......@@ -309,6 +309,6 @@ ZEXY_SETUP void setup_0x260x260x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
setup_0x260x260x7e();
setup_0x260x26_tilde();
}
#endif
......@@ -202,13 +202,13 @@ static void lt_tilde_dsp(t_lt_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(lt_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if(n&7) {
dsp_add(lt_tilde_perform, 4, in1, in2, out, n);
dsp_add(lt_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(lt_tilde_perf8, 4, in1, in2, out, n);
dsp_add(lt_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -225,13 +225,13 @@ static void scalarlt_tilde_dsp(t_scalarlt_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
static void lt_tilde_help(t_object* UNUSED(x))
......@@ -239,7 +239,7 @@ static void lt_tilde_help(t_object* UNUSED(x))
post("\n"HEARTSYMBOL " <~\t\t:: compare 2 signals");
}
ZEXY_SETUP void setup_0x3c0x7e(void)
ZEXY_SETUP void setup_0x3c_tilde(void)
{
lt_tilde_class = zexy_new("<~",
lt_tilde_new, 0, t_lt_tilde, 0, "*");
......@@ -261,6 +261,6 @@ ZEXY_SETUP void setup_0x3c0x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
setup_0x3c0x7e();
setup_0x3c_tilde();
}
#endif
......@@ -201,13 +201,13 @@ static void eq_tilde_dsp(t_eq_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(eq_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(eq_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(eq_tilde_perform, 4, in1, in2, out, n);
dsp_add(eq_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(eq_tilde_perf8, 4, in1, in2, out, n);
dsp_add(eq_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -224,13 +224,13 @@ static void scalareq_tilde_dsp(t_scalareq_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out) &&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalareq_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalareq_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalareq_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......@@ -238,7 +238,7 @@ static void eq_tilde_help(t_object* UNUSED(x))
{
post("\n"HEARTSYMBOL " &&~\t\t:: test 2 signals for equality");
}
ZEXY_SETUP void setup_0x3d0x3d0x7e(void)
ZEXY_SETUP void setup_0x3d0x3d_tilde(void)
{
eq_tilde_class = zexy_new("==~",
eq_tilde_new, 0, t_eq_tilde, 0, "*");
......@@ -261,6 +261,6 @@ ZEXY_SETUP void setup_0x3d0x3d0x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
setup_0x3d0x3d0x7e();
setup_0x3d0x3d_tilde();
}
#endif
......@@ -204,13 +204,13 @@ static void gt_tilde_dsp(t_gt_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(gt_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(gt_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(gt_tilde_perform, 4, in1, in2, out, n);
dsp_add(gt_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(gt_tilde_perf8, 4, in1, in2, out, n);
dsp_add(gt_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -227,13 +227,13 @@ static void scalargt_tilde_dsp(t_scalargt_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalargt_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalargt_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalargt_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......@@ -242,7 +242,7 @@ static void gt_tilde_help(t_object* UNUSED(x))
post("\n"HEARTSYMBOL " >~\t\t:: compare 2 signals");
}
ZEXY_SETUP void setup_0x3e0x7e(void)
ZEXY_SETUP void setup_0x3e_tilde(void)
{
gt_tilde_class = zexy_new(">~",
gt_tilde_new, 0, t_gt_tilde, 0, "*");
......@@ -265,6 +265,6 @@ ZEXY_SETUP void setup_0x3e0x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
setup_0x3e0x7e();
setup_0x3e_tilde();
}
#endif
......@@ -219,13 +219,13 @@ static void oror_tilde_dsp(t_oror_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(oror_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(oror_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if(n&7) {
dsp_add(oror_tilde_perform, 4, in1, in2, out, n);
dsp_add(oror_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(oror_tilde_perf8, 4, in1, in2, out, n);
dsp_add(oror_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -242,13 +242,13 @@ static void scalaroror_tilde_dsp(t_scalaroror_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......@@ -257,7 +257,7 @@ static void oror_tilde_help(t_object* UNUSED(x))
post("\n"HEARTSYMBOL " &&~\t\t:: logical OR operation on 2 signals");
}
ZEXY_SETUP void setup_0x7c0x7c0x7e(void)
ZEXY_SETUP void setup_0x7c0x7c_tilde(void)
{
oror_tilde_class = zexy_new("||~",
oror_tilde_new, 0, t_oror_tilde, 0, "*");
......@@ -281,6 +281,6 @@ ZEXY_SETUP void setup_0x7c0x7c0x7e(void)
#ifndef ZEXY_LIBRARY
void setup(void)
{
setup_0x7c0x7c0x7e();
setup_0x7c0x7c_tilde();
}
#endif
......@@ -106,12 +106,12 @@ static void sigABSGN_dsp(t_absgn* UNUSED(x), t_signal **sp)
zexy_testSSE(sigABSGN_perform, sigABSGN_performSSE, 1, 2)
) {
dsp_add(sigABSGN_performSSE, 4, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
} else
#endif
{
dsp_add(sigABSGN_perform, 4, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
}
}
......
......@@ -128,11 +128,11 @@ static void sigABS_dsp(t_abs * UNUSED(x), t_signal **sp)
sigABS_performSSE,
1, 1)
) {
dsp_add(sigABS_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(sigABS_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
} else
#endif
{
dsp_add(sigABS_perform, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(sigABS_perform, 3, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
}
......
......@@ -55,7 +55,7 @@ static t_int *avg_perform(t_int *w)
static void avg_dsp(t_avg *x, t_signal **sp)
{
x->n_inv=1./sp[0]->s_n;
dsp_add(avg_perform, 3, sp[0]->s_vec, x, sp[0]->s_n);
dsp_add(avg_perform, 3, sp[0]->s_vec, x, (t_int)sp[0]->s_n);
}
static void *avg_new(void)
......
......@@ -78,7 +78,7 @@ static void blockmirror_dsp(t_blockmirror *x, t_signal **sp)
x->blocksize = sp[0]->s_n;
x->blockbuffer = getbytes(sizeof(*x->blockbuffer)*x->blocksize);
}
dsp_add(blockmirror_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(blockmirror_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
static void blockmirror_helper(t_blockmirror* UNUSED(x))
......
......@@ -116,7 +116,7 @@ static void blockshuffle_dsp(t_blockshuffle *x, t_signal **sp)
blockshuffle_buildindex(x, sp[0]->s_n);
dsp_add(blockshuffle_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
}
static void blockshuffle_helper(t_blockshuffle* UNUSED(x))
......
......@@ -76,7 +76,7 @@ static void blockswap_dsp(t_blockswap *x, t_signal **sp)
x->blocksize = sp[0]->s_n/2;
x->blockbuffer = getbytes(sizeof(*x->blockbuffer)*x->blocksize);
}
dsp_add(blockswap_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(blockswap_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
static void blockswap_helper(t_blockswap* UNUSED(x))
......
......@@ -73,7 +73,7 @@ static void demux_dsp(t_demux *x, t_signal **sp)
while(n--) {
*dummy++=sp[x->n_out-n]->s_vec;
}
dsp_add(demux_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(demux_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
......
......@@ -82,7 +82,7 @@ static t_int *dfreq_perform(t_int *w)
static void dfreq_dsp(t_dfreq *x, t_signal **sp)
{
dsp_add(dfreq_perform, 4, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n,x);
dsp_add(dfreq_perform, 4, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n,x);
}
......
......@@ -110,9 +110,9 @@ static t_int *dirac_perf8(t_int *w)
static void dirac_dsp(t_dirac *x, t_signal **sp)
{
if (sp[0]->s_n & 7) {
dsp_add(dirac_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(dirac_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
} else {
dsp_add(dirac_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(dirac_perf8, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
}
......
......@@ -105,7 +105,7 @@ static void sigdoublepole_dsp(t_sigdoublepole *x, t_signal **sp)
{
dsp_add(sigdoublepole_perform, 4,
sp[0]->s_vec, sp[1]->s_vec,
x->x_ctl, sp[0]->s_n);
x->x_ctl, (t_int)sp[0]->s_n);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment