diff --git a/Source/FaustBoxAPI.cpp b/Source/FaustBoxAPI.cpp index cb68fbb0..d5fec173 100644 --- a/Source/FaustBoxAPI.cpp +++ b/Source/FaustBoxAPI.cpp @@ -479,6 +479,14 @@ py::module_ &create_bindings_for_faust_box(py::module &faust_module, return BoxWrapper(boxFVar(type, name, file)); }, arg("type"), arg("name"), arg("file")) + .def( + "boxFFun", + [](SType type, nvec names, svec atypes, const std::string &incfile, + const std::string &libfile) { + return BoxWrapper(boxFFun(type, names, atypes, incfile, libfile)); + }, + arg("type"), arg("names"), arg("arg_types"), arg("inc_file"), + arg("lib_file"), "Return a foreign function box.") .def( "boxBinOp", @@ -837,7 +845,7 @@ py::module_ &create_bindings_for_faust_box(py::module &faust_module, .def( "boxVGroup", [](std::string &label, BoxWrapper &box1) { - return BoxWrapper(boxHGroup(label, box1)); + return BoxWrapper(boxVGroup(label, box1)); }, arg("label"), arg("box"), "Create a vgroup.") @@ -872,7 +880,6 @@ py::module_ &create_bindings_for_faust_box(py::module &faust_module, : boxAttach()); }, arg("box1") = py::none(), arg("box2") = py::none()) - .def( "boxSampleRate", []() { diff --git a/Source/FaustSignalAPI.cpp b/Source/FaustSignalAPI.cpp index 509db1ee..6fccb55d 100644 --- a/Source/FaustSignalAPI.cpp +++ b/Source/FaustSignalAPI.cpp @@ -189,9 +189,7 @@ void create_bindings_for_faust_signal(py::module &faust_module, arg("sig1"), arg("sig2")) .def( "sigDelay1", - [](SigWrapper &sig1) { - return SigWrapper(sigDelay1(sig1)); - }, + [](SigWrapper &sig1) { return SigWrapper(sigDelay1(sig1)); }, arg("sig1")) .def( @@ -272,12 +270,22 @@ void create_bindings_for_faust_signal(py::module &faust_module, }, arg("selector"), arg("sig1"), arg("sig2"), arg("sig3")) + .def( + "sigFFun", + [](SType rtype, nvec names, svec atypes, const std::string &incfile, + const std::string &libfile, tvec largs) { + return SigWrapper( + sigFFun(rtype, names, atypes, incfile, libfile, largs)); + }, + arg("type"), arg("names"), arg("arg_types"), arg("inc_file"), + arg("lib_file"), arg("largs"), "Create a foreign function signal.") .def( "sigFConst", [](SType type, const std::string &name, const std::string &file) { return SigWrapper(sigFConst(type, name, file)); }, - arg("type"), arg("name"), arg("file")) + arg("type"), arg("name"), arg("file"), + "Create a foreign constant signal.") .def( "sigFVar", [](SType type, const std::string &name, const std::string &file) { diff --git a/thirdparty/faust b/thirdparty/faust index 5341a623..35f909c3 160000 --- a/thirdparty/faust +++ b/thirdparty/faust @@ -1 +1 @@ -Subproject commit 5341a623b04420089318e967153eaf7bef49aa5c +Subproject commit 35f909c3a32267a9ae960d53931a85245e40ba4a diff --git a/thirdparty/libfaust/download_libfaust.py b/thirdparty/libfaust/download_libfaust.py index 4415ace2..4381a0a2 100644 --- a/thirdparty/libfaust/download_libfaust.py +++ b/thirdparty/libfaust/download_libfaust.py @@ -58,7 +58,7 @@ def main(version: str) -> None: sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) parser = argparse.ArgumentParser(description="Download and install Libfaust.") - parser.add_argument("-v", "--version", default="2.69.3", help="Specify the version of Faust to download.") + parser.add_argument("-v", "--version", default="2.70.3", help="Specify the version of Faust to download.") parser.add_argument("--force", action="store_true", help="Force download even if files already exist.") args = parser.parse_args()