| Hi all,
I've extracted everything from cs.h except the compability macros and
moved them to a header csoundCore.h. cs.h #includes csoundCore.h, so
all code should compile fine. I've tested this with a fresh checkout
from csound5 cvs using dl_opcode.c and jpff_glue.c files and compile
without a hitch.
I've also updated csound.c to use ENVIRON instead of GLOBALS, and also
have swapped calls to global variables with dererferencing them from
the passed in csound *.
However, csound.c will not yet work, as main.c has changed between
csound4 and csound5. The main thing that is clashing right now is that
what was csoundMain in csound4 has more or less become csoundCompile in
csound5, which then causes linking problems if trying to use csound.c
instead of jpff_glue.c as there already is a csoundCompile function in
csound.c.
Also, I commented out inbuf in csound.c as I don't know where it is in
csound5, as well as stubbed out csoundNewOpcodeList and
csoundDisploseOpcodeList (commented out the code within the function) as
they don't quite make sense in context to csound5.
I added "FIXME" to sections in csound.c I thought should be looked at,
probably by more proficient programmers than I. =o
I'll be continuing on trying to get this file integrated in.
steven
|