From 5c488b682dbf0072e2c7126f12948a69e608fd0e Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 16 Mar 2021 16:08:10 +0000 Subject: changed readme --- README.md | 4 +--- plugin.h.patch | 4 ---- src/opcodes.cpp | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 plugin.h.patch diff --git a/README.md b/README.md index aab5688..f445476 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,10 @@ csound-xtract is a set of plugin opcodes which use libXtract to perform feature Development is still ongoing and subject to various research matters, thus is provided in an experimental/alpha state and may contain bugs. Parts of the code are due overhauls and refactoring, but the intention is for the opcodes and general operation to remain the same as presented here. -The current source of Csound has the member function get_csound() in plugin.h, however this does not function correctly. As of writing there is an outstanding issue on github so it is anticipated to be fixed soon. In the meantime a single line needs to be changed in plugin.h. The patch file plugin.h.patch is provided as an interim solution. - ## Requirements * Cmake >= 3.8 -* Csound development libraries/headers (with patch applied as above or get_csound() fixed) +* Csound with development headers >= 6.14.0 * [LibXtract](https://github.com/jamiebullock/LibXtract) Tested on Linux and Windows 7 with MSYS as of March 2021. diff --git a/plugin.h.patch b/plugin.h.patch deleted file mode 100644 index af4e621..0000000 --- a/plugin.h.patch +++ /dev/null @@ -1,4 +0,0 @@ -56c56 -< class Csound : CSOUND { ---- -> class Csound : public CSOUND { diff --git a/src/opcodes.cpp b/src/opcodes.cpp index 8878722..5979712 100644 --- a/src/opcodes.cpp +++ b/src/opcodes.cpp @@ -559,8 +559,8 @@ struct xtcorpus : csnd::Plugin<1, 2> { if (!(corpusProfile = getHandle(csound, inargs[0]))) { return csound->init_error("profile handle invalid"); } - - if ((corpus->input = csound->get_csound()->FTnp2Find(csound, &inargs[1])) == NULL) { + CSOUND* csbase = (CSOUND *) csound->get_csound(); + if ((corpus->input = csbase->FTnp2Find(csbase, &inargs[1])) == NULL) { return csound->init_error("cannot get function table specified"); } -- cgit v1.2.3