Menu
▾
▴
[foo-cvs] foo/libfoo/modules/orthodox FOOMAdd.h,1.2,1.3 FOOMAdd.m,1.1,1.2 FOOMBandlimitedNoise.h,1.2,1.3 FOOMBandlimitedNoise.m,1.1,1.2 FOOMConstantBiquad.h,1.2,1.3 FOOMConstantBiquad.m,1.1,1.2 FOOMConstantTwoPole.h,1.2,1.3 FOOMConstantTwoPole.m,1.1,1.2 FOOMConstantTwoPoleTwoZero.h,1.2,1.3 FOOMConstantTwoPoleTwoZero.m,1.1,1.2 FOOMDiff.h,1.2,1.3 FOOMDiff.m,1.1,1.2 FOOMDirac.h,1.2,1.3 FOOMDirac.m,1.1,1.2 FOOMDiv.h,1.2,1.3 FOOMDiv.m,1.1,1.2 FOOMExpon.h,1.2,1.3 FOOMExpon.m,1.2,1.3 FOOMFiltreVariableEtat.h,1.2,1.3 FOOMFiltreVariableEtat.m,1.1,1.2 FOOMFof.h,1.2,1.3 FOOMFof.m,1.2,1.3 FOOMGate.h,1.2,1.3 FOOMGate.m,1.2,1.3 FOOMInteg.h,1.2,1.3 FOOMInteg.m,1.1,1.2 FOOMLine.h,1.2,1.3 FOOMLine.m,1.2,1.3
Update of /cvsroot/foo/foo/libfoo/modules/orthodox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30235 Modified Files: FOOMAdd.h FOOMAdd.m FOOMBandlimitedNoise.h FOOMBandlimitedNoise.m FOOMConstantBiquad.h FOOMConstantBiquad.m FOOMConstantTwoPole.h FOOMConstantTwoPole.m FOOMConstantTwoPoleTwoZero.h FOOMConstantTwoPoleTwoZero.m FOOMDiff.h FOOMDiff.m FOOMDirac.h FOOMDirac.m FOOMDiv.h FOOMDiv.m FOOMExpon.h FOOMExpon.m FOOMFiltreVariableEtat.h FOOMFiltreVariableEtat.m FOOMFof.h FOOMFof.m FOOMGate.h FOOMGate.m FOOMInteg.h FOOMInteg.m FOOMLine.h FOOMLine.m Log Message: started with adding archiving methods Index: FOOMInteg.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMInteg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMInteg.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMInteg.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMInteg : FOOModule { double _last; --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMInteg : FOOModule <NSCoding> { double _last; Index: FOOMInteg.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMInteg.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMInteg.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMInteg.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMInteg.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMInteg *************** *** 86,88 **** --- 89,111 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMInteg *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMConstantTwoPole.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPole.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantTwoPole.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantTwoPole.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 35,41 **** /* $Id$ */ - #include <math.h> #include "FOOMConstantTwoPole.h" #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz --- 35,45 ---- /* $Id$ */ #include "FOOMConstantTwoPole.h" + #include <math.h> + + #import <Foundation/NSKeyedArchiver.h> + + #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz *************** *** 144,160 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "ddddddd", &c1, &c2, &c3, &y1, &y2, ¢erf, &bandw); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_read_types(stream, "ddddddd", &c1, &c2, &c3, &y1, &y2, ¢erf, &bandw); ! // return self; ! // } @end --- 148,207 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _c1 forKey: @"FOOMConstantTwoPole:c1"]; ! [coder encodeDouble: _c2 forKey: @"FOOMConstantTwoPole:c2"]; ! [coder encodeDouble: _c3 forKey: @"FOOMConstantTwoPole:c3"]; ! [coder encodeDouble: _y1 forKey: @"FOOMConstantTwoPole:y1"]; ! [coder encodeDouble: _y2 forKey: @"FOOMConstantTwoPole:y2"]; ! [coder encodeDouble: _centerf forKey: @"FOOMConstantTwoPole:centerf"]; ! [coder encodeDouble: _bandw forKey: @"FOOMConstantTwoPole:bandw"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_c2]; ! [coder encodeValueOfObjCType: @encode(double) at: &_c3]; ! [coder encodeValueOfObjCType: @encode(double) at: &_y1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_y2]; ! [coder encodeValueOfObjCType: @encode(double) at: &_centerf]; ! [coder encodeValueOfObjCType: @encode(double) at: &_bandw]; ! } ! ! return; ! } ! ! ! - (FOOMConstantTwoPole *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _c1 = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:c1"]; ! _c2 = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:c2"]; ! _c3 = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:c3"]; ! _y1 = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:y1"]; ! _y2 = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:y2"]; ! _centerf = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:centerf"]; ! _bandw = [coder decodeDoubleForKey: @"FOOMConstantTwoPole:bandw"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_c2]; ! [coder decodeValueOfObjCType: @encode(double) at: &_c3]; ! [coder decodeValueOfObjCType: @encode(double) at: &_y1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_y2]; ! [coder decodeValueOfObjCType: @encode(double) at: &_centerf]; ! [coder decodeValueOfObjCType: @encode(double) at: &_bandw]; ! } ! ! return self; ! } @end Index: FOOMDiv.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiv.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDiv.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDiv.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMDiv.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMDiv *************** *** 83,85 **** --- 86,108 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMDiv *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMDiff.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiff.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDiff.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDiff.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMDiff.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMDiff *************** *** 83,85 **** --- 86,108 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMDiff *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMDiff.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiff.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMDiff.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMDiff.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMDiff : FOOModule { double _last; --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMDiff : FOOModule <NSCoding> { double _last; Index: FOOMDiv.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiv.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMDiv.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMDiv.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMDiv : FOOModule { } --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMDiv : FOOModule <NSCoding> { } Index: FOOMAdd.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMAdd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMAdd.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMAdd.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMAdd : FOOModule { } --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMAdd : FOOModule <NSCoding> { } Index: FOOMExpon.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMExpon.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMExpon.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMExpon.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOEagerModule.h> ! @interface FOOMExpon : FOOEagerModule { double _factor; --- 40,44 ---- #include <FOO/FOOEagerModule.h> ! @interface FOOMExpon : FOOEagerModule <NSCoding> { double _factor; Index: FOOMConstantTwoPoleTwoZero.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPoleTwoZero.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantTwoPoleTwoZero.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantTwoPoleTwoZero.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 35,41 **** /* $Id$ */ - #include <math.h> #include "FOOMConstantTwoPoleTwoZero.h" #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz --- 35,45 ---- /* $Id$ */ #include "FOOMConstantTwoPoleTwoZero.h" + #include <math.h> + + #import <Foundation/NSKeyedArchiver.h> + + #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz *************** *** 139,155 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "dddddd", &c0, &c1, &c2, &d0, &d1, &d2); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_read_types(stream, "dddddd", &c0, &c1, &c2, &d0, &d1, &d2); ! // return self; ! // } @end --- 143,198 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _c0 forKey: @"FOOMConstantTwoPoleTwoZero:c0"]; ! [coder encodeDouble: _c1 forKey: @"FOOMConstantTwoPoleTwoZero:c1"]; ! [coder encodeDouble: _c2 forKey: @"FOOMConstantTwoPoleTwoZero:c2"]; ! [coder encodeDouble: _d0 forKey: @"FOOMConstantTwoPoleTwoZero:d0"]; ! [coder encodeDouble: _d1 forKey: @"FOOMConstantTwoPoleTwoZero:d1"]; ! [coder encodeDouble: _d2 forKey: @"FOOMConstantTwoPoleTwoZero:d2"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_c0]; ! [coder encodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_c2]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d0]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d2]; ! } ! ! return; ! } ! ! ! - (FOOMConstantTwoPoleTwoZero *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _c0 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:c0"]; ! _c1 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:c1"]; ! _c2 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:c2"]; ! _d0 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:d0"]; ! _d1 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:d1"]; ! _d2 = [coder decodeDoubleForKey: @"FOOMConstantTwoPoleTwoZero:d2"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_c0]; ! [coder decodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_c2]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d0]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d2]; ! } ! ! return self; ! } @end Index: FOOMExpon.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMExpon.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMExpon.m 6 Aug 2004 05:57:41 -0000 1.2 --- FOOMExpon.m 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 35,41 **** /* $Id$ */ - #include <math.h> #include "FOOMExpon.h" @implementation FOOMExpon --- 35,45 ---- /* $Id$ */ #include "FOOMExpon.h" + #include <math.h> + + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMExpon *************** *** 146,170 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "[8c][8c][8c][8c]", ! // &beginT, ! // &endT, ! // &startV, ! // &endV); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_write_types(stream, "[8c][8c][8c][8c]", ! // &beginT, ! // &endT, ! // &startV, ! // &endV); ! // return self; ! // } @end --- 150,197 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _beginT forKey: @"FOOMExpon:beginT"]; ! [coder encodeDouble: _endT forKey: @"FOOMExpon:endT"]; ! [coder encodeDouble: _startV forKey: @"FOOMExpon:startV"]; ! [coder encodeDouble: _endV forKey: @"FOOMExpon:endV"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder encodeValueOfObjCType: @encode(double) at: &_endT]; ! [coder encodeValueOfObjCType: @encode(double) at: &_startV]; ! [coder encodeValueOfObjCType: @encode(double) at: &_endV]; ! } ! ! return; ! } ! ! ! - (FOOMExpon *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _beginT = [coder decodeDoubleForKey: @"FOOMExpon:beginT"]; ! _endT = [coder decodeDoubleForKey: @"FOOMExpon:endT"]; ! _startV = [coder decodeDoubleForKey: @"FOOMExpon:startV"]; ! _endV = [coder decodeDoubleForKey: @"FOOMExpon:endV"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder decodeValueOfObjCType: @encode(double) at: &_endT]; ! [coder decodeValueOfObjCType: @encode(double) at: &_startV]; ! [coder decodeValueOfObjCType: @encode(double) at: &_endV]; ! } ! ! return self; ! } @end Index: FOOMConstantTwoPoleTwoZero.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPoleTwoZero.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMConstantTwoPoleTwoZero.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMConstantTwoPoleTwoZero.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantTwoPoleTwoZero : FOOEagerModule { double _c0, _c1, _c2; --- 40,44 ---- #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantTwoPoleTwoZero : FOOEagerModule <NSCoding> { double _c0, _c1, _c2; Index: FOOMConstantTwoPole.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPole.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMConstantTwoPole.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMConstantTwoPole.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantTwoPole : FOOEagerModule { double _c1, _c2, _c3; --- 40,44 ---- #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantTwoPole : FOOEagerModule <NSCoding> { double _c1, _c2, _c3; Index: FOOMDirac.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDirac.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDirac.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDirac.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMDirac.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMDirac *************** *** 90,106 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "[8c][4c]", &timeT, &litude); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_write_types(stream, "[8c][4c]", &timeT, &litude); ! // return self; ! // } @end --- 93,132 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _timeT forKey: @"FOOMDirac:timeT"]; ! ENCODE_KEYED_SAMPLE_T(_amplitude, @"FOOMDirac:amplitude") ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_timeT]; ! ENCODE_UNKEYED_SAMPLE_T(_amplitude) ! } ! ! return; ! } ! ! ! - (FOOMDirac *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _timeT = [coder decodeDoubleForKey: @"FOOMDirac:timeT"]; ! DECODE_KEYED_SAMPLE_T(_amplitude, @"FOOMDirac:amplitude") ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_timeT]; ! DECODE_UNKEYED_SAMPLE_T(_amplitude) ! } ! ! return self; ! } @end Index: FOOMDirac.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDirac.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMDirac.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMDirac.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMDirac : FOOModule { double _timeT; --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMDirac : FOOModule <NSCoding> { double _timeT; Index: FOOMFof.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMFof.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMFof.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 115,119 **** } fof_t; ! @interface FOOMFof : FOOEagerModule { fof_t _fof; --- 115,119 ---- } fof_t; ! @interface FOOMFof : FOOEagerModule <NSCoding> { fof_t _fof; Index: FOOMFof.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMFof.m 6 Aug 2004 05:57:41 -0000 1.2 --- FOOMFof.m 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 35,42 **** /* $Id$ */ #include <stdlib.h> #include <math.h> ! #include "FOOMFof.h" --- 35,44 ---- /* $Id$ */ + #include "FOOMFof.h" + #include <stdlib.h> #include <math.h> ! #import <Foundation/NSKeyedArchiver.h> *************** *** 482,484 **** --- 484,506 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMFof *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMConstantBiquad.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantBiquad.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantBiquad.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantBiquad.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 35,41 **** /* $Id$ */ - #include <math.h> #include "FOOMConstantBiquad.h" #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz --- 35,45 ---- /* $Id$ */ #include "FOOMConstantBiquad.h" + #include <math.h> + + #import <Foundation/NSKeyedArchiver.h> + + #define INFINITE_TAIL 2147483647 // 2^31-1 samples => ~12 hours at 50 kHz *************** *** 152,168 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "ddddd", &d0, &d1, &d2, &c0, &c1); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_read_types(stream, "ddddd", &d0, &d1, &d2, &c0, &c1); ! // return self; ! // } @end --- 156,207 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _c0 forKey: @"FOOMConstantBiquad:c0"]; ! [coder encodeDouble: _c1 forKey: @"FOOMConstantBiquad:c1"]; ! [coder encodeDouble: _d0 forKey: @"FOOMConstantBiquad:d0"]; ! [coder encodeDouble: _d1 forKey: @"FOOMConstantBiquad:d1"]; ! [coder encodeDouble: _d2 forKey: @"FOOMConstantBiquad:d2"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_c0]; ! [coder encodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d0]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d1]; ! [coder encodeValueOfObjCType: @encode(double) at: &_d2]; ! } ! ! return; ! } ! ! ! - (FOOMConstantBiquad *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _c0 = [coder decodeDoubleForKey: @"FOOMConstantBiquad:c0"]; ! _c1 = [coder decodeDoubleForKey: @"FOOMConstantBiquad:c1"]; ! _d0 = [coder decodeDoubleForKey: @"FOOMConstantBiquad:d0"]; ! _d1 = [coder decodeDoubleForKey: @"FOOMConstantBiquad:d1"]; ! _d2 = [coder decodeDoubleForKey: @"FOOMConstantBiquad:d2"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_c0]; ! [coder decodeValueOfObjCType: @encode(double) at: &_c1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d0]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d1]; ! [coder decodeValueOfObjCType: @encode(double) at: &_d2]; ! } ! ! return self; ! } @end Index: FOOMFiltreVariableEtat.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFiltreVariableEtat.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMFiltreVariableEtat.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMFiltreVariableEtat.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 35,41 **** /* $Id$ */ - #include <math.h> #include "FOOMFiltreVariableEtat.h" @implementation FOOMFiltreVariableEtat --- 35,45 ---- /* $Id$ */ #include "FOOMFiltreVariableEtat.h" + #include <math.h> + + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMFiltreVariableEtat *************** *** 129,131 **** --- 133,155 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMFiltreVariableEtat *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMLine.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLine.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMLine.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMLine.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOEagerModule.h> ! @interface FOOMLine : FOOEagerModule { double _origin; --- 40,44 ---- #include <FOO/FOOEagerModule.h> ! @interface FOOMLine : FOOEagerModule <NSCoding> { double _origin; Index: FOOMConstantBiquad.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantBiquad.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMConstantBiquad.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMConstantBiquad.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantBiquad : FOOEagerModule { double _d0, _d1, _d2; --- 40,44 ---- #include <FOO/FOOEagerModule.h> ! @interface FOOMConstantBiquad : FOOEagerModule <NSCoding> { double _d0, _d1, _d2; Index: FOOMLine.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLine.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMLine.m 6 Aug 2004 05:57:41 -0000 1.2 --- FOOMLine.m 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMLine.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMLine *************** *** 145,161 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "[8c][8c][8c][8c][8c]", &origin, &incr, &beginT, &endT, &range); ! // return self; ! // } - // - write:(TypedStream *)stream - // { - // [super write:stream]; - // objc_write_types(stream, "[8c][8c][8c][8c][8c]", &origin, &incr, &beginT, &endT, &range); - // return self; - // } - @end --- 148,199 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _origin forKey: @"FOOMLine:origin"]; ! [coder encodeDouble: _incr forKey: @"FOOMLine:incr"]; ! [coder encodeDouble: _beginT forKey: @"FOOMLine:beginT"]; ! [coder encodeDouble: _endT forKey: @"FOOMLine:endT"]; ! [coder encodeDouble: _range forKey: @"FOOMLine:range"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_origin]; ! [coder encodeValueOfObjCType: @encode(double) at: &_incr]; ! [coder encodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder encodeValueOfObjCType: @encode(double) at: &_endT]; ! [coder encodeValueOfObjCType: @encode(double) at: &_range]; ! } ! ! return; ! } ! ! ! - (FOOMLine *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _origin = [coder decodeDoubleForKey: @"FOOMLine:origin"]; ! _incr = [coder decodeDoubleForKey: @"FOOMLine:incr"]; ! _beginT = [coder decodeDoubleForKey: @"FOOMLine:beginT"]; ! _endT = [coder decodeDoubleForKey: @"FOOMLine:endT"]; ! _range = [coder decodeDoubleForKey: @"FOOMLine:range"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_origin]; ! [coder decodeValueOfObjCType: @encode(double) at: &_incr]; ! [coder decodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder decodeValueOfObjCType: @encode(double) at: &_endT]; ! [coder decodeValueOfObjCType: @encode(double) at: &_range]; ! } ! ! return self; ! } @end Index: FOOMFiltreVariableEtat.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFiltreVariableEtat.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMFiltreVariableEtat.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMFiltreVariableEtat.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 41,45 **** #include <FOO/FOOGlobal.h> ! @interface FOOMFiltreVariableEtat : FOOEagerModule { sample_t _Lt1, _Bt1; --- 41,45 ---- #include <FOO/FOOGlobal.h> ! @interface FOOMFiltreVariableEtat : FOOEagerModule <NSCoding> { sample_t _Lt1, _Bt1; Index: FOOMGate.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMGate.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMGate.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMGate.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 40,44 **** #include <FOO/FOOModule.h> ! @interface FOOMGate : FOOModule { int _begin; --- 40,44 ---- #include <FOO/FOOModule.h> ! @interface FOOMGate : FOOModule <NSCoding> { int _begin; Index: FOOMAdd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMAdd.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMAdd.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMAdd.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMAdd.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMAdd *************** *** 97,99 **** --- 100,122 ---- } + + /* + * archiving methods + */ + + - (void) encodeWithCoder: (NSCoder *)coder + { + [super encodeWithCoder: coder]; + + return; + } + + + - (FOOMAdd *) initWithCoder: (NSCoder *)coder + { + self = [super initWithCoder: coder]; + + return self; + } + @end Index: FOOMGate.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMGate.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMGate.m 6 Aug 2004 05:57:41 -0000 1.2 --- FOOMGate.m 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 37,40 **** --- 37,43 ---- #include "FOOMGate.h" + #import <Foundation/NSKeyedArchiver.h> + + @implementation FOOMGate *************** *** 134,150 **** */ ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "[8c][8c]", &beginT, &endT); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_write_types(stream, "[8c][8c]", &beginT, &endT); ! // return self; ! // } @end --- 137,176 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeDouble: _beginT forKey: @"FOOMGate:beginT"]; ! [coder encodeDouble: _endT forKey: @"FOOMGate:endT"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder encodeValueOfObjCType: @encode(double) at: &_endT]; ! } ! ! return; ! } ! ! ! - (FOOMGate *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _beginT = [coder decodeDoubleForKey: @"FOOMGate:beginT"]; ! _endT = [coder decodeDoubleForKey: @"FOOMGate:endT"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(double) at: &_beginT]; ! [coder decodeValueOfObjCType: @encode(double) at: &_endT]; ! } ! ! return self; ! } @end Index: FOOMBandlimitedNoise.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMBandlimitedNoise.h 4 Aug 2004 06:20:31 -0000 1.2 --- FOOMBandlimitedNoise.h 14 Aug 2004 07:09:45 -0000 1.3 *************** *** 41,45 **** #include <FOO/FOOLookupTable.h> ! @interface FOOMBandlimittedNoise : FOOModule { int _state; --- 41,45 ---- #include <FOO/FOOLookupTable.h> ! @interface FOOMBandlimitedNoise : FOOModule <NSCoding> { int _state; Index: FOOMBandlimitedNoise.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMBandlimitedNoise.m 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMBandlimitedNoise.m 14 Aug 2004 07:09:45 -0000 1.2 *************** *** 37,41 **** #include "FOOMBandlimitedNoise.h" ! @implementation FOOMBandlimittedNoise - initializeTaps: (int)n seed: (int)seed --- 37,44 ---- #include "FOOMBandlimitedNoise.h" ! #import <Foundation/NSKeyedArchiver.h> ! ! ! @implementation FOOMBandlimitedNoise - initializeTaps: (int)n seed: (int)seed *************** *** 140,164 **** */ ! // - awake ! // { ! // [super awake]; ! // table = [GlobalsManager getSineXoverXTable:taps]; ! // samples = NSZoneCalloc([self zone], taps, sizeof(double)); ! // return self; ! // } ! // - read:(TypedStream *)stream ! // { ! // [super read:stream]; ! // objc_read_types(stream, "iii", &state, &taps, &init); ! // return self; ! // } ! // - write:(TypedStream *)stream ! // { ! // [super write:stream]; ! // objc_write_types(stream, "iii", &state, &taps, &init); ! // return self; ! // } @end --- 143,189 ---- */ ! - (void) encodeWithCoder: (NSCoder *)coder ! { ! [super encodeWithCoder: coder]; ! if ([coder allowsKeyedCoding]) ! { ! [coder encodeInt: _state forKey: @"FOOMBandlimitedNoise:state"]; ! [coder encodeInt: _taps forKey: @"FOOMBandlimitedNoise:taps"]; ! [coder encodeInt: _init forKey: @"FOOMBandlimitedNoise:init"]; ! } ! else ! { ! [coder encodeValueOfObjCType: @encode(int) at: &_state]; ! [coder encodeValueOfObjCType: @encode(int) at: &_taps]; ! [coder encodeValueOfObjCType: @encode(int) at: &_init]; ! } ! return; ! } ! ! ! - (FOOMBandlimitedNoise *) initWithCoder: (NSCoder *)coder ! { ! self = [super initWithCoder: coder]; ! ! if ([coder allowsKeyedCoding]) ! { ! _state = [coder decodeIntForKey: @"FOOMBandlimitedNoise:state"]; ! _taps = [coder decodeIntForKey: @"FOOMBandlimitedNoise:taps"]; ! _init = [coder decodeIntForKey: @"FOOMBandlimitedNoise:init"]; ! } ! else ! { ! [coder decodeValueOfObjCType: @encode(int) at: &_state]; ! [coder decodeValueOfObjCType: @encode(int) at: &_taps]; ! [coder decodeValueOfObjCType: @encode(int) at: &_init]; ! } ! ! _table = [FOOGlobalsManager getSineXoverXTable: _taps]; ! _samples = NSZoneCalloc([self zone], _taps, sizeof(double)); ! ! return self; ! } @end |
