Update of /cvsroot/foo/foo/libfoo/modules/orthodox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31999 Modified Files: FOOMAdd.m FOOMBandlimitedNoise.m FOOMConstant.m FOOMConstantBiquad.m FOOMConstantTwoPole.m FOOMConstantTwoPoleTwoZero.m FOOMDiff.m FOOMDirac.m FOOMDiv.m FOOMExpon.m FOOMFiltreVariableEtat.m FOOMFof.m FOOMGate.m FOOMInteg.m FOOMLine.m FOOMMath.h FOOMMath.m FOOMMul.h FOOMMul.m FOOMNeg.h FOOMNeg.m FOOMOscillator.m FOOMSub.h FOOMSub.m FOOMVariableTwoPole.h FOOMVariableTwoPole.m Log Message: added some archiving functions. seemed not to be strictly necessary, but looks better to fully comply with <NSCoding> protocol. changed coding style for archiving methods to return (id) rather than specific module type. Index: FOOMConstantTwoPole.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPole.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMConstantTwoPole.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMConstantTwoPole.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 175,179 **** ! - (FOOMConstantTwoPole *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 175,179 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMInteg.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMInteg.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMInteg.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMInteg.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 100,104 **** ! - (FOOMInteg *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 100,104 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMDiv.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiv.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMDiv.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMDiv.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 97,101 **** ! - (FOOMDiv *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 97,101 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMDiff.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiff.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMDiff.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMDiff.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 97,101 **** ! - (FOOMDiff *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 97,101 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMConstantTwoPoleTwoZero.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPoleTwoZero.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMConstantTwoPoleTwoZero.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMConstantTwoPoleTwoZero.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 168,172 **** ! - (FOOMConstantTwoPoleTwoZero *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 168,172 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMExpon.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMExpon.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FOOMExpon.m 15 Aug 2004 17:42:37 -0000 1.4 --- FOOMExpon.m 16 Aug 2004 05:20:49 -0000 1.5 *************** *** 171,175 **** ! - (FOOMExpon *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 171,175 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMNeg.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNeg.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMNeg.m 15 Aug 2004 17:42:37 -0000 1.2 --- FOOMNeg.m 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 68,70 **** --- 68,90 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMDirac.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDirac.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMDirac.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMDirac.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 110,114 **** ! - (FOOMDirac *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 110,114 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMOscillator.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMOscillator.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMOscillator.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMOscillator.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 164,168 **** ! - (FOOMOscillator *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 164,168 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMSub.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMSub.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMSub.m 1 Aug 2004 23:25:34 -0000 1.2 --- FOOMSub.m 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 93,95 **** --- 93,115 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMFof.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FOOMFof.m 15 Aug 2004 17:42:37 -0000 1.4 --- FOOMFof.m 16 Aug 2004 05:20:49 -0000 1.5 *************** *** 495,499 **** ! - (FOOMFof *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 495,499 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMSub.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMSub.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMSub.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMSub.h 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 40,45 **** #include <FOO/FOOModule.h> ! @interface FOOMSub : FOOModule { } @end --- 40,47 ---- #include <FOO/FOOModule.h> ! ! @interface FOOMSub : FOOModule <NSCoding> { + } @end Index: FOOMConstantBiquad.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantBiquad.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMConstantBiquad.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMConstantBiquad.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 179,183 **** ! - (FOOMConstantBiquad *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 179,183 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMMath.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMath.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMMath.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMMath.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 38,80 **** ! #define MAKE_CLASS_IMPL1(name, operation) \ ! @implementation name \ ! - (BOOL) compute \ ! { \ ! sample_t *in, *out; \ ! int n = BLOCKSIZE; \ ! COMPUTE_PROLOGUE; \ ! [INPUT(0) compute]; \ ! in = DATA_OF_MOD(INPUT(0)); \ ! out = DATA_OF_BUF(_buffer); \ ! while (n--) \ ! { \ ! *out++ = operation(*in++); \ ! } \ ! COMPUTE_EPILOGUE; \ ! } \ ! @end ! #define MAKE_CLASS_IMPL2(name, operation) \ ! @implementation name \ ! - (BOOL) compute \ ! { \ ! sample_t *in1, *in2, *out; \ ! int n = BLOCKSIZE; \ ! COMPUTE_PROLOGUE; \ ! [INPUT(0) compute]; \ ! [INPUT(1) compute]; \ ! in1 = DATA_OF_MOD(INPUT(0)); \ ! in2 = DATA_OF_MOD(INPUT(1)); \ ! out = DATA_OF_BUF(_buffer); \ ! while (n--) \ ! { \ ! *out++ = operation(*in1, *in2); \ ! in1++; \ ! in2++; \ ! } \ ! COMPUTE_EPILOGUE; \ ! } \ ! @end --- 38,105 ---- ! #define MAKE_CLASS_IMPL1(name, operation) \ ! @implementation name \ ! - (BOOL) compute \ ! { \ ! sample_t *in, *out; \ ! int n = BLOCKSIZE; \ ! COMPUTE_PROLOGUE; \ ! [INPUT(0) compute]; \ ! in = DATA_OF_MOD(INPUT(0)); \ ! out = DATA_OF_BUF(_buffer); \ ! while (n--) \ ! { \ ! *out++ = operation(*in++); \ ! } \ ! COMPUTE_EPILOGUE; \ ! } \ ! \ ! - (void) encodeWithCoder: (NSCoder *)coder \ ! { \ ! [super encodeWithCoder: coder]; \ ! return; \ ! } \ ! \ ! - (id) initWithCoder: (NSCoder *)coder \ ! { \ ! self = [super initWithCoder: coder]; \ ! return self; \ ! } \ ! @end ! ! #define MAKE_CLASS_IMPL2(name, operation) \ ! @implementation name \ ! - (BOOL) compute \ ! { \ ! sample_t *in1, *in2, *out; \ ! int n = BLOCKSIZE; \ ! COMPUTE_PROLOGUE; \ ! [INPUT(0) compute]; \ ! [INPUT(1) compute]; \ ! in1 = DATA_OF_MOD(INPUT(0)); \ ! in2 = DATA_OF_MOD(INPUT(1)); \ ! out = DATA_OF_BUF(_buffer); \ ! while (n--) \ ! { \ ! *out++ = operation(*in1, *in2); \ ! in1++; \ ! in2++; \ ! } \ ! COMPUTE_EPILOGUE; \ ! } \ ! \ ! - (void) encodeWithCoder: (NSCoder *)coder \ ! { \ ! [super encodeWithCoder: coder]; \ ! return; \ ! } \ ! \ ! - (id) initWithCoder: (NSCoder *)coder \ ! { \ ! self = [super initWithCoder: coder]; \ ! return self; \ ! } \ ! @end *************** *** 92,95 **** --- 117,139 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } @end *************** *** 114,117 **** --- 158,181 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMConstant.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstant.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMConstant.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMConstant.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 89,93 **** ! - (FOOMConstant *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 89,93 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMNeg.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNeg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMNeg.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMNeg.h 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 40,45 **** #include <FOO/FOOModule.h> ! @interface FOOMNeg : FOOModule { } @end --- 40,47 ---- #include <FOO/FOOModule.h> ! ! @interface FOOMNeg : FOOModule <NSCoding> { + } @end Index: FOOMLine.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLine.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FOOMLine.m 15 Aug 2004 17:42:37 -0000 1.4 --- FOOMLine.m 16 Aug 2004 05:20:49 -0000 1.5 *************** *** 171,175 **** ! - (FOOMLine *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 171,175 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMMath.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMath.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMMath.h 15 Aug 2004 16:48:55 -0000 1.3 --- FOOMMath.h 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 55,64 **** #endif ! @interface FOOMMath1 : FOOModule { } @end ! @interface FOOMMath2 : FOOModule { } --- 55,64 ---- #endif ! @interface FOOMMath1 : FOOModule <NSCoding> { } @end ! @interface FOOMMath2 : FOOModule <NSCoding> { } *************** *** 66,70 **** #define MAKE_CLASS_INT1(name) \ ! @interface name : FOOMMath1 \ { \ } \ --- 66,70 ---- #define MAKE_CLASS_INT1(name) \ ! @interface name : FOOMMath1 <NSCoding> \ { \ } \ *************** *** 72,76 **** #define MAKE_CLASS_INT2(name) \ ! @interface name : FOOMMath2 \ { \ } \ --- 72,76 ---- #define MAKE_CLASS_INT2(name) \ ! @interface name : FOOMMath2 <NSCoding> \ { \ } \ Index: FOOMAdd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMAdd.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMAdd.m 15 Aug 2004 17:42:36 -0000 1.3 --- FOOMAdd.m 16 Aug 2004 05:20:48 -0000 1.4 *************** *** 111,115 **** ! - (FOOMAdd *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 111,115 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMMul.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMul.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMMul.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMMul.h 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMMul : FOOModule { } --- 40,45 ---- #include <FOO/FOOModule.h> ! ! @interface FOOMMul : FOOModule <NSCoding> { } Index: FOOMGate.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMGate.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FOOMGate.m 15 Aug 2004 17:42:37 -0000 1.4 --- FOOMGate.m 16 Aug 2004 05:20:49 -0000 1.5 *************** *** 154,158 **** ! - (FOOMGate *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 154,158 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMMul.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMul.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMMul.m 15 Aug 2004 17:42:37 -0000 1.2 --- FOOMMul.m 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 85,87 **** --- 85,107 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMVariableTwoPole.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMVariableTwoPole.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMVariableTwoPole.m 15 Aug 2004 17:42:37 -0000 1.2 --- FOOMVariableTwoPole.m 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 164,166 **** --- 164,186 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (id) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMVariableTwoPole.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMVariableTwoPole.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMVariableTwoPole.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMVariableTwoPole.h 16 Aug 2004 05:20:49 -0000 1.3 *************** *** 41,45 **** #include <FOO/FOOGlobal.h> ! @interface FOOMVariableTwoPole : FOOEagerModule { sample_t _y1, _y2; --- 41,45 ---- #include <FOO/FOOGlobal.h> ! @interface FOOMVariableTwoPole : FOOEagerModule <NSCoding> { sample_t _y1, _y2; Index: FOOMFiltreVariableEtat.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFiltreVariableEtat.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMFiltreVariableEtat.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMFiltreVariableEtat.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 144,148 **** ! - (FOOMFiltreVariableEtat *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 144,148 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; Index: FOOMBandlimitedNoise.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOMBandlimitedNoise.m 15 Aug 2004 17:42:37 -0000 1.3 --- FOOMBandlimitedNoise.m 16 Aug 2004 05:20:49 -0000 1.4 *************** *** 162,166 **** ! - (FOOMBandlimitedNoise *) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; --- 162,166 ---- ! - (id) initWithCoder: (NSCoder *)coder { self = [super initWithCoder: coder]; |