From 6cff7d0993de7d059c52ce737dca398d380dec88 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Mon, 3 Feb 2020 16:48:06 -0800 Subject: libs/sig: s/sig_ops_inv/sig_ops_neg/g Rename inv->neg, preparation for a new sig_ops_inv for inverting 0..1 to 1..0 --- src/libs/sig/Makefile.am | 2 +- src/libs/sig/ops_inv.c | 52 ------------------------------------------------ src/libs/sig/ops_neg.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libs/sig/sig.h | 2 +- 4 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 src/libs/sig/ops_inv.c create mode 100644 src/libs/sig/ops_neg.c (limited to 'src/libs') diff --git a/src/libs/sig/Makefile.am b/src/libs/sig/Makefile.am index 7c13a16..8ce9366 100644 --- a/src/libs/sig/Makefile.am +++ b/src/libs/sig/Makefile.am @@ -1,3 +1,3 @@ noinst_LIBRARIES = libsig.a -libsig_a_SOURCES = ops_abs.c ops_add.c ops_ceil.c ops_clamp.c ops_const.c ops_div.c ops_expand.c ops_floor.c ops_inv.c ops_lerp.c ops_max.c ops_min.c ops_mult.c ops_pow.c ops_rand.c ops_round.c ops_scale.c ops_sin.c ops_sub.c sig.c sig.h +libsig_a_SOURCES = ops_abs.c ops_add.c ops_ceil.c ops_clamp.c ops_const.c ops_div.c ops_expand.c ops_floor.c ops_lerp.c ops_max.c ops_min.c ops_mult.c ops_neg.c ops_pow.c ops_rand.c ops_round.c ops_scale.c ops_sin.c ops_sub.c sig.c sig.h libsig_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/sig/ops_inv.c b/src/libs/sig/ops_inv.c deleted file mode 100644 index abb1102..0000000 --- a/src/libs/sig/ops_inv.c +++ /dev/null @@ -1,52 +0,0 @@ -#include - -#include "sig.h" - - -typedef struct ops_inv_ctxt_t { - sig_t *x; -} ops_inv_ctxt_t; - - -static size_t ops_inv_size(va_list ap) -{ - return sizeof(ops_inv_ctxt_t); -} - - -static void ops_inv_init(void *context, va_list ap) -{ - ops_inv_ctxt_t *ctxt = context; - - assert(ctxt); - - ctxt->x = va_arg(ap, sig_t *); -} - - -static void ops_inv_destroy(void *context) -{ - ops_inv_ctxt_t *ctxt = context; - - assert(ctxt); - - sig_free(ctxt->x); -} - - -static float ops_inv_output(void *context, unsigned ticks_ms) -{ - ops_inv_ctxt_t *ctxt = context; - - assert(ctxt); - - return -sig_output(ctxt->x, ticks_ms); -} - - -sig_ops_t sig_ops_inv = { - .size = ops_inv_size, - .init = ops_inv_init, - .destroy = ops_inv_destroy, - .output = ops_inv_output, -}; diff --git a/src/libs/sig/ops_neg.c b/src/libs/sig/ops_neg.c new file mode 100644 index 0000000..594e394 --- /dev/null +++ b/src/libs/sig/ops_neg.c @@ -0,0 +1,52 @@ +#include + +#include "sig.h" + + +typedef struct ops_neg_ctxt_t { + sig_t *x; +} ops_neg_ctxt_t; + + +static size_t ops_neg_size(va_list ap) +{ + return sizeof(ops_neg_ctxt_t); +} + + +static void ops_neg_init(void *context, va_list ap) +{ + ops_neg_ctxt_t *ctxt = context; + + assert(ctxt); + + ctxt->x = va_arg(ap, sig_t *); +} + + +static void ops_neg_destroy(void *context) +{ + ops_neg_ctxt_t *ctxt = context; + + assert(ctxt); + + sig_free(ctxt->x); +} + + +static float ops_neg_output(void *context, unsigned ticks_ms) +{ + ops_neg_ctxt_t *ctxt = context; + + assert(ctxt); + + return -sig_output(ctxt->x, ticks_ms); +} + + +sig_ops_t sig_ops_neg = { + .size = ops_neg_size, + .init = ops_neg_init, + .destroy = ops_neg_destroy, + .output = ops_neg_output, +}; diff --git a/src/libs/sig/sig.h b/src/libs/sig/sig.h index 57b9a90..deb0ce3 100644 --- a/src/libs/sig/sig.h +++ b/src/libs/sig/sig.h @@ -34,11 +34,11 @@ extern sig_ops_t sig_ops_clamp; extern sig_ops_t sig_ops_div; extern sig_ops_t sig_ops_expand; extern sig_ops_t sig_ops_floor; -extern sig_ops_t sig_ops_inv; extern sig_ops_t sig_ops_lerp; extern sig_ops_t sig_ops_max; extern sig_ops_t sig_ops_min; extern sig_ops_t sig_ops_mult; +extern sig_ops_t sig_ops_neg; extern sig_ops_t sig_ops_pow; extern sig_ops_t sig_ops_round; extern sig_ops_t sig_ops_scale; -- cgit v1.2.1