Add sigSelfZeroN in signal API. Add ciaramella.cpp with 5 crm example…

…s converted to signal API.
grame-cncm · Aug 27, 2023 · 2075912 · 2075912
1 parent 295c027
commit 2075912
Show file tree

Hide file tree

Showing 18 changed files with 1,839 additions and 1 deletion.
diff --git a/architecture/faust/dsp/libfaust-signal.h b/architecture/faust/dsp/libfaust-signal.h
@@ -473,6 +473,13 @@ LIBFAUST_API Signal sigAtan2(Signal x, Signal y);
  */
 LIBFAUST_API Signal sigSelf();
 
+/**
+ * Create a recursive signal inside the sigRecursion expression, without the one sample delay.
+ *
+ * @return the recursive signal.
+ */
+LIBFAUST_API Signal sigSelfZero();
+
 /**
  * Create a recursive signal. Use sigSelf() to refer to the
  * recursive signal inside the sigRecursion expression.
@@ -492,6 +499,15 @@ LIBFAUST_API Signal sigRecursion(Signal s);
  */
 LIBFAUST_API Signal sigSelfN(int id);
 
+/**
+ * Create a recursive signal inside the sigRecursionN expression, without the one sample delay.
+ *
+ * @param id - the recursive signal index (starting from 0, up to the number of outputs signals in the recursive block)
+ *
+ * @return the recursive signal.
+ */
+LIBFAUST_API Signal sigSelfZeroN(int id);
+
 /**
  * Create a recursive block of signals. Use sigSelfN() to refer to the
  * recursive signal inside the sigRecursionN expression.

diff --git a/architecture/max-msp/py2max b/architecture/max-msp/py2max
diff --git a/compiler/box_signal_api.cpp b/compiler/box_signal_api.cpp
@@ -211,6 +211,11 @@ LIBFAUST_API Tree sigSelf()
     return sigDelay1(sigProj(0, ref(1)));
 }
 
+LIBFAUST_API Tree sigSelfZero()
+{
+    return sigDelay0(sigProj(0, ref(1)));
+}
+
 LIBFAUST_API Tree sigRecursion(Tree s)
 {
     return sigDelay0(sigProj(0, rec(cons(s, gGlobal->nil))));
@@ -222,6 +227,11 @@ LIBFAUST_API Tree sigSelfN(int i)
     return sigDelay1(sigProj(i, ref(1)));
 }
 
+LIBFAUST_API Tree sigSelfZeroN(int i)
+{
+    return sigDelay0(sigProj(i, ref(1)));
+}
+
 LIBFAUST_API tvec sigRecursionN(const tvec& ins)
 {
     Tree out = rec(listConvert(ins));

diff --git a/tools/benchmark/Makefile b/tools/benchmark/Makefile
@@ -100,6 +100,9 @@ interp-tracer: interp-tracer.cpp $(LIB)/libfaust.a
 signal-tester: signal-tester.cpp $(LIB)/libfaust.a
 	$(CXX) $(COMPILEOPT) $(ARCHS) signal-tester.cpp -L $(LIB_FLAGS) $(LIBS) -I $(INC) $(LLVM) `pkg-config --cflags --libs jack gtk+-2.0` $(STRIP) -lz -lncurses -lpthread -o $@
 
+ciaramella: ciaramella.cpp $(LIB)/libfaust.a
+	$(CXX) $(COMPILEOPT) ciaramella.cpp -L/opt/local/lib $(LIBS) -I $(INC) $(LLVM) `pkg-config --cflags --libs jack gtk+-2.0` $(STRIP) -lz -lncurses -lpthread -o $@
+
 signal-tester-c: signal-tester.c $(LIB)/libfaust.a
 	$(CXX) $(COMPILEOPT1) $(ARCHS) signal-tester.c -L $(LIB_FLAGS) $(LIBS) -I $(INC) $(LLVM) $(STRIP) -lz -lncurses -lpthread -o signal-tester-c
+12 −77		README.md
+0 −25		py2max/core.py
+0 −216		tests/data/tabular.maxpat
+24 −0		tests/test_combo_osc.py
+62 −69		tests/test_layout_networkx1.py
+43 −49		tests/test_layout_networkx2.py
+45 −43		tests/test_layout_nx_graphviz.py
+60 −60		tests/test_layout_nx_orthogonal.py
+60 −59		tests/test_layout_nx_tsmpy.py
+0 −15		tests/test_pitched_osc.py
+1 −59		tests/test_table.py