Menu
▾
▴
foo-cvs — mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
(270) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(8) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
(2) |
Dec
(2) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(3) |
Nov
(1) |
Dec
(14) |
| 2008 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(31) |
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(90) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: Martin R. <ru...@us...> - 2004-08-04 06:43:13
|
Update of /cvsroot/foo/foo/libfoo/FOO In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27453 Modified Files: FOOGlobalsManager.h Log Message: added +getVersion Index: FOOGlobalsManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOGlobalsManager.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOGlobalsManager.h 4 Aug 2004 06:15:57 -0000 1.2 --- FOOGlobalsManager.h 4 Aug 2004 06:43:02 -0000 1.3 *************** *** 66,69 **** --- 66,71 ---- */ + + (NSString *) getVersion; + + (BOOL) trace; + (void) setTrace: (BOOL)val; |
|
From: Martin R. <ru...@us...> - 2004-08-04 06:42:45
|
Update of /cvsroot/foo/foo/libfoo/tests/foosine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27379 Modified Files: foosine.m Log Message: added version print Index: foosine.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/tests/foosine/foosine.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** foosine.m 4 Aug 2004 06:21:30 -0000 1.3 --- foosine.m 4 Aug 2004 06:42:34 -0000 1.4 *************** *** 48,51 **** --- 48,52 ---- #include <FOO/FOOGlobal.h> + #include <FOO/FOOGlobalsManager.h> #include <FOO/FOOContext.h> #include <FOO/FOOOutput.h> *************** *** 84,87 **** --- 85,91 ---- [[NSAutoreleasePool alloc] init]; + // print stuff + NSLog(@"foosine test using libfoo version %@", [FOOGlobalsManager getVersion]); + // create context _context = [[FOOContext alloc] initWithChans: 1]; |
|
From: Martin R. <ru...@us...> - 2004-08-04 06:21:39
|
Update of /cvsroot/foo/foo/libfoo/tests/foosine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24849 Modified Files: foosine.m Log Message: fixed includes Index: foosine.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/tests/foosine/foosine.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** foosine.m 31 Jul 2004 07:18:48 -0000 1.2 --- foosine.m 4 Aug 2004 06:21:30 -0000 1.3 *************** *** 46,52 **** #import <Foundation/NSAutoreleasePool.h> ! #include <FOOGlobal.h> ! #include <FOOContext.h> ! #include <FOOOutput.h> #include <orthodox/FOOMOscillator.h> #include <orthodox/FOOMConstant.h> --- 46,53 ---- #import <Foundation/NSAutoreleasePool.h> ! ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOContext.h> ! #include <FOO/FOOOutput.h> #include <orthodox/FOOMOscillator.h> #include <orthodox/FOOMConstant.h> |
Update of /cvsroot/foo/foo/libfoo/modules/orthodox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24697 Modified Files: FOOMAdd.h FOOMBandlimitedNoise.h FOOMConstant.h FOOMConstantBiquad.h FOOMConstantTwoPole.h FOOMConstantTwoPoleTwoZero.h FOOMDiff.h FOOMDirac.h FOOMDiv.h FOOMExpon.h FOOMFiltreVariableEtat.h FOOMFof.h FOOMGate.h FOOMInteg.h FOOMLine.h FOOMLookup.h FOOMLookup.m FOOMMath.h FOOMMul.h FOOMNeg.h FOOMNoise.h FOOMOscillator.h FOOMReadBpf.h FOOMReadBpf.m FOOMReadSnd.h FOOMReadTranspSnd.h FOOMReverb.h FOOMReverb8.h FOOMReverbOutput.h FOOMSub.h FOOMTransposeBpf.h FOOMTransposeSnd.h FOOMTransposeSnd.m FOOMVariableTwoPole.h Log Message: fixed include directives Index: FOOMLookup.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLookup.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMLookup.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMLookup.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,44 **** #define FOOM_FOOMLOOKUP_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOSubstrate.h" ! #include "FOOLookupTable.h" @interface FOOMLookup : FOOEagerModule --- 38,44 ---- #define FOOM_FOOMLOOKUP_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOSubstrate.h> ! #include <FOO/FOOLookupTable.h> @interface FOOMLookup : FOOEagerModule Index: FOOMLookup.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLookup.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMLookup.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMLookup.m 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 36,42 **** #include "FOOMLookup.h" ! #include "FOOSoundFile.h" ! #include "FOOSoundStream.h" ! #include "FOORegion.h" #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size --- 36,42 ---- #include "FOOMLookup.h" ! #include <FOO/FOOSoundFile.h> ! #include <FOO/FOOSoundStream.h> ! #include <FOO/FOORegion.h> #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size Index: FOOMInteg.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMInteg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMInteg.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMInteg.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMINTEG_H_INCLUDED ! #include "FOOModule.h" @interface FOOMInteg : FOOModule --- 38,42 ---- #define FOOM_FOOMINTEG_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMInteg : FOOModule Index: FOOMReadTranspSnd.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadTranspSnd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadTranspSnd.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadTranspSnd.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,46 **** #define FOOM_FOOMREADTRANSPSND_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOSoundStream.h" ! #include "FOOSoundFile.h" ! #include "FOORegion.h" ! #include "FOOLookupTable.h" @interface FOOMReadTranspSnd : FOOEagerModule --- 38,46 ---- #define FOOM_FOOMREADTRANSPSND_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOSoundStream.h> ! #include <FOO/FOOSoundFile.h> ! #include <FOO/FOORegion.h> ! #include <FOO/FOOLookupTable.h> @interface FOOMReadTranspSnd : FOOEagerModule Index: FOOMTransposeSnd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMTransposeSnd.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMTransposeSnd.m 1 Aug 2004 23:39:20 -0000 1.2 --- FOOMTransposeSnd.m 4 Aug 2004 06:20:31 -0000 1.3 *************** *** 41,46 **** #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size - @implementation FOOMTransposeSnd - initializeWith: substr taps: (int) n --- 41,46 ---- #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size + @implementation FOOMTransposeSnd - initializeWith: substr taps: (int) n Index: FOOMConstantTwoPoleTwoZero.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPoleTwoZero.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantTwoPoleTwoZero.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantTwoPoleTwoZero.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMCONSTANTTWOPOLETWOZERO_H_INCLUDED ! #include "FOOEagerModule.h" @interface FOOMConstantTwoPoleTwoZero : FOOEagerModule --- 38,42 ---- #define FOOM_FOOMCONSTANTTWOPOLETWOZERO_H_INCLUDED ! #include <FOO/FOOEagerModule.h> @interface FOOMConstantTwoPoleTwoZero : FOOEagerModule Index: FOOMDiff.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiff.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDiff.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDiff.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMDIFF_H_INCLUDED ! #include "FOOModule.h" @interface FOOMDiff : FOOModule --- 38,42 ---- #define FOOM_FOOMDIFF_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMDiff : FOOModule Index: FOOMDiv.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiv.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDiv.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDiv.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMDIV_H_INCLUDED ! #include "FOOModule.h" @interface FOOMDiv : FOOModule --- 38,42 ---- #define FOOM_FOOMDIV_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMDiv : FOOModule Index: FOOMTransposeBpf.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMTransposeBpf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMTransposeBpf.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMTransposeBpf.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,44 **** #define FOOM_FOOMTRANSPOSEBPF_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOEagerModule.h" ! #include "FOOBreakpointFunction.h" @interface FOOMTransposeBpf : FOOEagerModule --- 38,44 ---- #define FOOM_FOOMTRANSPOSEBPF_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOBreakpointFunction.h> @interface FOOMTransposeBpf : FOOEagerModule Index: FOOMTransposeSnd.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMTransposeSnd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMTransposeSnd.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMTransposeSnd.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,46 **** #define FOOM_FOOMTRANSPOSESND_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOSoundStream.h" ! #include "FOOSoundFile.h" ! #include "FOORegion.h" ! #include "FOOLookupTable.h" #include "FOOMMath.h" --- 38,46 ---- #define FOOM_FOOMTRANSPOSESND_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOSoundStream.h> ! #include <FOO/FOOSoundFile.h> ! #include <FOO/FOORegion.h> ! #include <FOO/FOOLookupTable.h> #include "FOOMMath.h" Index: FOOMExpon.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMExpon.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMExpon.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMExpon.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMEXPON_H_INCLUDED ! #include "FOOEagerModule.h" @interface FOOMExpon : FOOEagerModule --- 38,42 ---- #define FOOM_FOOMEXPON_H_INCLUDED ! #include <FOO/FOOEagerModule.h> @interface FOOMExpon : FOOEagerModule Index: FOOMReadBpf.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadBpf.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMReadBpf.m 1 Aug 2004 23:39:20 -0000 1.2 --- FOOMReadBpf.m 4 Aug 2004 06:20:31 -0000 1.3 *************** *** 36,40 **** #include "FOOMReadBpf.h" ! #include "FOOBreakpointFunction.h" #define FIRST_TIME -1 --- 36,40 ---- #include "FOOMReadBpf.h" ! #include <FOO/FOOBreakpointFunction.h> #define FIRST_TIME -1 Index: FOOMNeg.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNeg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMNeg.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMNeg.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMNEG_H_INCLUDED ! #include "FOOModule.h" @interface FOOMNeg : FOOModule --- 38,42 ---- #define FOOM_FOOMNEG_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMNeg : FOOModule Index: FOOMReverb8.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReverb8.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReverb8.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReverb8.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMREVERB8_H_INCLUDED ! #include "FOOEagerModule.h" #include <Foundation/NSArray.h> #include <math.h> --- 38,42 ---- #define FOOM_FOOMREVERB8_H_INCLUDED ! #include <FOO/FOOEagerModule.h> #include <Foundation/NSArray.h> #include <math.h> Index: FOOMReverb.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReverb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReverb.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReverb.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMREVERB_H_INCLUDED ! #include "FOOEagerModule.h" #include <Foundation/NSArray.h> #include <math.h> --- 38,42 ---- #define FOOM_FOOMREVERB_H_INCLUDED ! #include <FOO/FOOEagerModule.h> #include <Foundation/NSArray.h> #include <math.h> Index: FOOMOscillator.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMOscillator.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMOscillator.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMOscillator.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,43 **** #define FOOM_FOOMOSCILLATOR_H_INCLUDED ! #include "FOOModule.h" ! #include "FOOLookupTable.h" #include <Foundation/NSString.h> --- 38,43 ---- #define FOOM_FOOMOSCILLATOR_H_INCLUDED ! #include <FOO/FOOModule.h> ! #include <FOO/FOOLookupTable.h> #include <Foundation/NSString.h> Index: FOOMReadSnd.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadSnd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadSnd.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadSnd.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,45 **** #define FOOM_FOOMREADSND_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOSoundStream.h" ! #include "FOOSoundFile.h" ! #include "FOORegion.h" @interface FOOMReadSnd : FOOEagerModule --- 38,45 ---- #define FOOM_FOOMREADSND_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOSoundStream.h> ! #include <FOO/FOOSoundFile.h> ! #include <FOO/FOORegion.h> @interface FOOMReadSnd : FOOEagerModule Index: FOOMFiltreVariableEtat.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFiltreVariableEtat.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMFiltreVariableEtat.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMFiltreVariableEtat.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,43 **** #define FOOM_FOOMFILTREVARIABLEETAT_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOGlobal.h" @interface FOOMFiltreVariableEtat : FOOEagerModule --- 38,43 ---- #define FOOM_FOOMFILTREVARIABLEETAT_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOGlobal.h> @interface FOOMFiltreVariableEtat : FOOEagerModule Index: FOOMReadBpf.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadBpf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadBpf.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadBpf.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,44 **** #define FOOM_FOOMREADBPF_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOEagerModule.h" ! #include "FOOBreakpointFunction.h" @interface FOOMReadBpf : FOOEagerModule --- 38,44 ---- #define FOOM_FOOMREADBPF_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOBreakpointFunction.h> @interface FOOMReadBpf : FOOEagerModule Index: FOOMReverbOutput.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReverbOutput.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReverbOutput.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReverbOutput.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMREVERBOUTPUT_H_INCLUDED ! #include "FOOModule.h" @interface FOOMReverbOutput : FOOModule --- 38,42 ---- #define FOOM_FOOMREVERBOUTPUT_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMReverbOutput : FOOModule Index: FOOMDirac.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDirac.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMDirac.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMDirac.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMDIRAC_H_INCLUDED ! #include "FOOModule.h" @interface FOOMDirac : FOOModule --- 38,42 ---- #define FOOM_FOOMDIRAC_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMDirac : FOOModule Index: FOOMFof.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMFof.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMFof.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMFOF_H_INCLUDED ! #include "FOOEagerModule.h" #include "FOOMMath.h" --- 38,42 ---- #define FOOM_FOOMFOF_H_INCLUDED ! #include <FOO/FOOEagerModule.h> #include "FOOMMath.h" Index: FOOMSub.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMSub.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMSub.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMSub.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMSUB_H_INCLUDED ! #include "FOOModule.h" @interface FOOMSub : FOOModule --- 38,42 ---- #define FOOM_FOOMSUB_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMSub : FOOModule Index: FOOMConstant.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstant.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstant.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstant.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMCONSTANT_H_INCLUDED ! #include "FOOModule.h" @interface FOOMConstant : FOOModule --- 38,42 ---- #define FOOM_FOOMCONSTANT_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMConstant : FOOModule Index: FOOMLine.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLine.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMLine.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMLine.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMLINE_H_INCLUDED ! #include "FOOEagerModule.h" @interface FOOMLine : FOOEagerModule --- 38,42 ---- #define FOOM_FOOMLINE_H_INCLUDED ! #include <FOO/FOOEagerModule.h> @interface FOOMLine : FOOEagerModule Index: FOOMNoise.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNoise.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMNoise.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMNoise.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMNOISE_H_INCLUDED ! #include "FOOModule.h" @interface FOOMNoise : FOOModule --- 38,42 ---- #define FOOM_FOOMNOISE_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMNoise : FOOModule Index: FOOMConstantBiquad.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantBiquad.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantBiquad.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantBiquad.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMCONSTANTBIQUAD_H_INCLUDED ! #include "FOOEagerModule.h" @interface FOOMConstantBiquad : FOOEagerModule --- 38,42 ---- #define FOOM_FOOMCONSTANTBIQUAD_H_INCLUDED ! #include <FOO/FOOEagerModule.h> @interface FOOMConstantBiquad : FOOEagerModule Index: FOOMMath.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMath.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMMath.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMMath.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMMATH_H_INCLUDED ! #include "FOOModule.h" // already defined in <GNUstepBase/preface.h> --- 38,42 ---- #define FOOM_FOOMMATH_H_INCLUDED ! #include <FOO/FOOModule.h> // already defined in <GNUstepBase/preface.h> Index: FOOMGate.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMGate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMGate.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMGate.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMGATE_H_INCLUDED ! #include "FOOModule.h" @interface FOOMGate : FOOModule --- 38,42 ---- #define FOOM_FOOMGATE_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMGate : FOOModule Index: FOOMMul.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMul.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMMul.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMMul.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMMUL_H_INCLUDED ! #include "FOOModule.h" @interface FOOMMul : FOOModule --- 38,42 ---- #define FOOM_FOOMMUL_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMMul : FOOModule Index: FOOMBandlimitedNoise.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMBandlimitedNoise.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMBandlimitedNoise.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,43 **** #define FOOM_FOOMBANDLIMITEDNOISE_H_INCLUDED ! #include "FOOModule.h" ! #include "FOOLookupTable.h" @interface FOOMBandlimittedNoise : FOOModule --- 38,43 ---- #define FOOM_FOOMBANDLIMITEDNOISE_H_INCLUDED ! #include <FOO/FOOModule.h> ! #include <FOO/FOOLookupTable.h> @interface FOOMBandlimittedNoise : FOOModule Index: FOOMConstantTwoPole.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPole.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMConstantTwoPole.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMConstantTwoPole.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMCONSTANTTWOPOLE_H_INCLUDED ! #include "FOOEagerModule.h" @interface FOOMConstantTwoPole : FOOEagerModule --- 38,42 ---- #define FOOM_FOOMCONSTANTTWOPOLE_H_INCLUDED ! #include <FOO/FOOEagerModule.h> @interface FOOMConstantTwoPole : FOOEagerModule Index: FOOMAdd.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMAdd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMAdd.h 31 Jul 2004 03:05:29 -0000 1.1 --- FOOMAdd.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,42 **** #define FOOM_FOOMADD_H_INCLUDED ! #include "FOOModule.h" @interface FOOMAdd : FOOModule --- 38,42 ---- #define FOOM_FOOMADD_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOMAdd : FOOModule Index: FOOMVariableTwoPole.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMVariableTwoPole.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMVariableTwoPole.h 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMVariableTwoPole.h 4 Aug 2004 06:20:31 -0000 1.2 *************** *** 38,43 **** #define FOOM_FOOMVARIABLETWOPOLE_H_INCLUDED ! #include "FOOEagerModule.h" ! #include "FOOGlobal.h" @interface FOOMVariableTwoPole : FOOEagerModule --- 38,43 ---- #define FOOM_FOOMVARIABLETWOPOLE_H_INCLUDED ! #include <FOO/FOOEagerModule.h> ! #include <FOO/FOOGlobal.h> @interface FOOMVariableTwoPole : FOOEagerModule |
Update of /cvsroot/foo/foo/libfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24169 Modified Files: FOOBreakpointFunction.m FOOBuffer.m FOOBufferManager.m FOOContext.m FOOContextPart.m FOOEagerModule.m FOOEagerModuleManager.m FOOFileTable.m FOOGlobalsManager.m FOOLookupTable.m FOOModule.m FOOModuleManager.m FOONilModule.m FOOObject.m FOOObjectManager.m FOOOutput.m FOOOutputManager.m FOORegion.m FOOSineTable.m FOOSineXoverXTable.m FOOSoundFile.m FOOSoundStream.m FOOSubstrate.m FOOSubstrateManager.m Log Message: fixed include directives in order to reflect new FOO include dir Index: FOOSubstrateManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSubstrateManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSubstrateManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSubstrateManager.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOSubstrateManager.h" ! #include "FOOSubstrate.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOSubstrateManager.h" ! #include "FOO/FOOSubstrate.h" Index: FOOGlobalsManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOGlobalsManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOGlobalsManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOGlobalsManager.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 41,48 **** #import <Foundation/NSValue.h> ! #include "FOOGlobalsManager.h" ! #include "FOOSineTable.h" ! #include "FOOSineXoverXTable.h" ! #include "FOOFileTable.h" --- 41,48 ---- #import <Foundation/NSValue.h> ! #include "FOO/FOOGlobalsManager.h" ! #include "FOO/FOOSineTable.h" ! #include "FOO/FOOSineXoverXTable.h" ! #include "FOO/FOOFileTable.h" Index: FOOSineXoverXTable.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSineXoverXTable.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSineXoverXTable.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSineXoverXTable.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 36,40 **** #include <math.h> ! #include "FOOSineXoverXTable.h" --- 36,40 ---- #include <math.h> ! #include "FOO/FOOSineXoverXTable.h" Index: FOOObject.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOObject.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOObject.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOObject.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,39 **** /* $Id$ */ ! #include "FOOObject.h" @implementation FOOObject --- 35,39 ---- /* $Id$ */ ! #include "FOO/FOOObject.h" @implementation FOOObject Index: FOOFileTable.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOFileTable.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOFileTable.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOFileTable.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOFileTable.h" ! #include "FOOSoundFile.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOFileTable.h" ! #include "FOO/FOOSoundFile.h" Index: FOOBufferManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOBufferManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOBufferManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOBufferManager.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOBufferManager.h" ! #include "FOOBuffer.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOBufferManager.h" ! #include "FOO/FOOBuffer.h" Index: FOOObjectManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOObjectManager.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOObjectManager.m 2 Aug 2004 00:39:00 -0000 1.2 --- FOOObjectManager.m 4 Aug 2004 06:16:41 -0000 1.3 *************** *** 35,39 **** /* $Id$ */ ! #include "FOOObjectManager.h" --- 35,39 ---- /* $Id$ */ ! #include "FOO/FOOObjectManager.h" Index: FOORegion.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOORegion.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOORegion.m 1 Aug 2004 23:41:15 -0000 1.2 --- FOORegion.m 4 Aug 2004 06:16:41 -0000 1.3 *************** *** 35,42 **** /* $Id$ */ ! #include "FOORegion.h" ! #include "FOOSoundStream.h" ! #include "FOOSoundFile.h" ! #include "FOOContext.h" --- 35,42 ---- /* $Id$ */ ! #include "FOO/FOORegion.h" ! #include "FOO/FOOSoundStream.h" ! #include "FOO/FOOSoundFile.h" ! #include "FOO/FOOContext.h" Index: FOOOutput.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOOutput.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOOutput.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOOutput.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,54 **** /* $Id$ */ ! #include "FOOOutput.h" ! #include "FOOContext.h" ! #include "FOOModule.h" ! #include "FOOObjectManager.h" ! #include "FOOGlobalsManager.h" ! #include "FOOModuleManager.h" ! #include "FOOEagerModuleManager.h" ! #include "FOOSubstrateManager.h" ! #include "FOOOutputManager.h" ! #include "FOOBufferManager.h" ! #include "FOONilModule.h" ! #include "FOOEagerModule.h" ! #include "FOOOutput.h" ! #include "FOOModule.h" ! #include "FOOSubstrate.h" ! #include "FOOBuffer.h" --- 35,54 ---- /* $Id$ */ ! #include "FOO/FOOOutput.h" ! #include "FOO/FOOContext.h" ! #include "FOO/FOOModule.h" ! #include "FOO/FOOObjectManager.h" ! #include "FOO/FOOGlobalsManager.h" ! #include "FOO/FOOModuleManager.h" ! #include "FOO/FOOEagerModuleManager.h" ! #include "FOO/FOOSubstrateManager.h" ! #include "FOO/FOOOutputManager.h" ! #include "FOO/FOOBufferManager.h" ! #include "FOO/FOONilModule.h" ! #include "FOO/FOOEagerModule.h" ! #include "FOO/FOOOutput.h" ! #include "FOO/FOOModule.h" ! #include "FOO/FOOSubstrate.h" ! #include "FOO/FOOBuffer.h" Index: FOOOutputManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOOutputManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOOutputManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOOutputManager.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,43 **** /* $Id$ */ ! #include "FOOOutputManager.h" ! #include "FOOOutput.h" ! #include "FOOBuffer.h" ! #include "FOOSoundFile.h" ! #include "FOOContext.h" --- 35,43 ---- /* $Id$ */ ! #include "FOO/FOOOutputManager.h" ! #include "FOO/FOOOutput.h" ! #include "FOO/FOOBuffer.h" ! #include "FOO/FOOSoundFile.h" ! #include "FOO/FOOContext.h" Index: FOOModule.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOModule.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOModule.m 2 Aug 2004 00:39:00 -0000 1.3 --- FOOModule.m 4 Aug 2004 06:16:41 -0000 1.4 *************** *** 35,43 **** /* $Id$ */ ! #include "FOOModule.h" ! #include "FOONilModule.h" ! #include "FOOBuffer.h" ! #include "FOOContext.h" ! #include "FOONilModule.h" // static FOONilModule *_nilModule = nil; --- 35,43 ---- /* $Id$ */ ! #include "FOO/FOOModule.h" ! #include "FOO/FOONilModule.h" ! #include "FOO/FOOBuffer.h" ! #include "FOO/FOOContext.h" ! #include "FOO/FOONilModule.h" // static FOONilModule *_nilModule = nil; Index: FOOContext.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOContext.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOContext.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOContext.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 37,49 **** #include <signal.h> ! #include "FOOContext.h" ! #include "FOOGlobalsManager.h" ! #include "FOOModuleManager.h" ! #include "FOOEagerModuleManager.h" ! #include "FOOSubstrateManager.h" ! #include "FOOOutputManager.h" ! #include "FOOBufferManager.h" ! #include "FOONilModule.h" ! #include "FOOBuffer.h" --- 37,49 ---- #include <signal.h> ! #include "FOO/FOOContext.h" ! #include "FOO/FOOGlobalsManager.h" ! #include "FOO/FOOModuleManager.h" ! #include "FOO/FOOEagerModuleManager.h" ! #include "FOO/FOOSubstrateManager.h" ! #include "FOO/FOOOutputManager.h" ! #include "FOO/FOOBufferManager.h" ! #include "FOO/FOONilModule.h" ! #include "FOO/FOOBuffer.h" Index: FOOContextPart.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOContextPart.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOContextPart.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOContextPart.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOContextPart.h" ! #include "FOOContext.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOContextPart.h" ! #include "FOO/FOOContext.h" Index: FOOSubstrate.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSubstrate.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FOOSubstrate.m 2 Aug 2004 00:39:00 -0000 1.3 --- FOOSubstrate.m 4 Aug 2004 06:16:41 -0000 1.4 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOSubstrate.h" ! #include "FOOContext.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOSubstrate.h" ! #include "FOO/FOOContext.h" Index: FOONilModule.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOONilModule.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOONilModule.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOONilModule.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,39 **** /* $Id$ */ ! #include "FOONilModule.h" @implementation FOONilModule --- 35,39 ---- /* $Id$ */ ! #include "FOO/FOONilModule.h" @implementation FOONilModule Index: FOOSoundFile.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSoundFile.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSoundFile.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSoundFile.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 36,40 **** ! #include "FOOSoundFile.h" // #define FOOSOUNDFILE_DEBUG --- 36,40 ---- ! #include "FOO/FOOSoundFile.h" // #define FOOSOUNDFILE_DEBUG Index: FOOBreakpointFunction.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOBreakpointFunction.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOBreakpointFunction.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOBreakpointFunction.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 37,45 **** #import <Foundation/NSString.h> ! #include "FOOBreakpointFunction.h" ! #include "FOOGlobalsManager.h" ! #include "FOOOutputManager.h" ! #include "FOOModule.h" ! #include "FOOContext.h" --- 37,45 ---- #import <Foundation/NSString.h> ! #include "FOO/FOOBreakpointFunction.h" ! #include "FOO/FOOGlobalsManager.h" ! #include "FOO/FOOOutputManager.h" ! #include "FOO/FOOModule.h" ! #include "FOO/FOOContext.h" Index: FOOEagerModuleManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOEagerModuleManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOEagerModuleManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOEagerModuleManager.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOEagerModuleManager.h" ! #include "FOOEagerModule.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOEagerModuleManager.h" ! #include "FOO/FOOEagerModule.h" Index: FOOSineTable.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSineTable.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSineTable.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSineTable.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 36,40 **** #include <math.h> ! #include "FOOSineTable.h" --- 36,40 ---- #include <math.h> ! #include "FOO/FOOSineTable.h" Index: FOOBuffer.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOBuffer.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOBuffer.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOBuffer.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOBuffer.h" ! #include "FOOContext.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOBuffer.h" ! #include "FOO/FOOContext.h" Index: FOOSoundStream.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSoundStream.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOSoundStream.m 1 Aug 2004 23:41:15 -0000 1.2 --- FOOSoundStream.m 4 Aug 2004 06:16:41 -0000 1.3 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOSoundStream.h" ! #include "FOOSoundFile.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOSoundStream.h" ! #include "FOO/FOOSoundFile.h" Index: FOOLookupTable.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOLookupTable.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOLookupTable.m 2 Aug 2004 00:39:00 -0000 1.2 --- FOOLookupTable.m 4 Aug 2004 06:16:41 -0000 1.3 *************** *** 35,39 **** /* $Id$ */ ! #include "FOOLookupTable.h" --- 35,39 ---- /* $Id$ */ ! #include "FOO/FOOLookupTable.h" Index: FOOEagerModule.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOEagerModule.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOEagerModule.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOEagerModule.m 4 Aug 2004 06:16:41 -0000 1.2 *************** *** 35,41 **** /* $Id$ */ ! #include "FOOEagerModule.h" ! #include "FOOContext.h" ! #include "FOOBuffer.h" --- 35,41 ---- /* $Id$ */ ! #include "FOO/FOOEagerModule.h" ! #include "FOO/FOOContext.h" ! #include "FOO/FOOBuffer.h" Index: FOOModuleManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOModuleManager.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOModuleManager.m 2 Aug 2004 00:44:20 -0000 1.2 --- FOOModuleManager.m 4 Aug 2004 06:16:41 -0000 1.3 *************** *** 35,40 **** /* $Id$ */ ! #include "FOOModuleManager.h" ! #include "FOOModule.h" --- 35,40 ---- /* $Id$ */ ! #include "FOO/FOOModuleManager.h" ! #include "FOO/FOOModule.h" |
Update of /cvsroot/foo/foo/libfoo/FOO In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24041 Modified Files: FOOBreakpointFunction.h FOOBuffer.h FOOBufferManager.h FOOContext.h FOOContextPart.h FOOEagerModule.h FOOEagerModuleManager.h FOOFileTable.h FOOGlobal.h FOOGlobalsManager.h FOOLookupTable.h FOOModule.h FOOModuleManager.h FOONilModule.h FOOObjectManager.h FOOOutput.h FOOOutputManager.h FOORegion.h FOOSineTable.h FOOSineXoverXTable.h FOOSoundFile.h FOOSoundStream.h FOOSubstrate.h FOOSubstrateManager.h Log Message: fixed include statements in .h files to FOO/FOOxxx Index: FOOContextPart.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOContextPart.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOContextPart.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOContextPart.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOCONTEXTPART_H_INCLUDED ! #include "FOOObject.h" @class FOOContext; --- 38,42 ---- #define FOO_FOOCONTEXTPART_H_INCLUDED ! #include <FOO/FOOObject.h> @class FOOContext; Index: FOOSineXoverXTable.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSineXoverXTable.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSineXoverXTable.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSineXoverXTable.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOSINEXOVERXTABLE_H_INCLUDED ! #include "FOOLookupTable.h" --- 38,42 ---- #define FOO_FOOSINEXOVERXTABLE_H_INCLUDED ! #include <FOO/FOOLookupTable.h> Index: FOOFileTable.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOFileTable.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOFileTable.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOFileTable.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOFILETABLE_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOLookupTable.h" --- 38,43 ---- #define FOO_FOOFILETABLE_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOLookupTable.h> Index: FOOGlobalsManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOGlobalsManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOGlobalsManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOGlobalsManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 40,45 **** #import <Foundation/NSString.h> ! #include "FOOGlobal.h" ! #include "FOOObject.h" @class FOOLookupTable; --- 40,45 ---- #import <Foundation/NSString.h> ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObject.h> @class FOOLookupTable; Index: FOOSubstrateManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSubstrateManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSubstrateManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSubstrateManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOSUBSTRATEMANAGER_H_INCLUDED ! #include "FOOObjectManager.h" --- 38,42 ---- #define FOO_FOOSUBSTRATEMANAGER_H_INCLUDED ! #include <FOO/FOOObjectManager.h> Index: FOOBufferManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOBufferManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOBufferManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOBufferManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOBUFFERMANAGER_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOObjectManager.h" --- 38,43 ---- #define FOO_FOOBUFFERMANAGER_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObjectManager.h> Index: FOOGlobal.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOGlobal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOGlobal.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOGlobal.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 42,46 **** #import <Foundation/NSString.h> ! #include "FOOGlobalsManager.h" typedef float sample_t; --- 42,46 ---- #import <Foundation/NSString.h> ! #include <FOO/FOOGlobalsManager.h> typedef float sample_t; Index: FOOOutput.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOOutput.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOOutput.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOOutput.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOOUTPUT_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOContextPart.h" @class FOOOutputManager; --- 38,43 ---- #define FOO_FOOOUTPUT_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOContextPart.h> @class FOOOutputManager; Index: FOOSubstrate.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSubstrate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSubstrate.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSubstrate.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOSUBSTRATE_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOContextPart.h" --- 38,43 ---- #define FOO_FOOSUBSTRATE_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOContextPart.h> Index: FOOModule.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOModule.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOModule.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOModule.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,45 **** #define FOO_FOOMODULE_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOContextPart.h" ! #include "FOOBuffer.h" ! #include "FOOContext.h" #import <Foundation/NSArray.h> --- 38,45 ---- #define FOO_FOOMODULE_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOContextPart.h> ! #include <FOO/FOOBuffer.h> ! #include <FOO/FOOContext.h> #import <Foundation/NSArray.h> Index: FOOContext.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOContext.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOContext.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOContext.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOCONTEXT_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOObject.h" @class FOOObjectManager; --- 38,43 ---- #define FOO_FOOCONTEXT_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObject.h> @class FOOObjectManager; Index: FOOOutputManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOOutputManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOOutputManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOOutputManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOOUTPUTMANAGER_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOObjectManager.h" #import <Foundation/NSString.h> --- 38,43 ---- #define FOO_FOOOUTPUTMANAGER_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObjectManager.h> #import <Foundation/NSString.h> Index: FOONilModule.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOONilModule.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOONilModule.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOONilModule.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOONILMODULE_H_INCLUDED ! #include "FOOObject.h" --- 38,42 ---- #define FOO_FOONILMODULE_H_INCLUDED ! #include <FOO/FOOObject.h> Index: FOOSoundFile.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSoundFile.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSoundFile.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSoundFile.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOSOUNDFILE_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOSubstrate.h" #import <Foundation/NSString.h> --- 38,43 ---- #define FOO_FOOSOUNDFILE_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOSubstrate.h> #import <Foundation/NSString.h> Index: FOOEagerModuleManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOEagerModuleManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOEagerModuleManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOEagerModuleManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOEAGERMODULEMANAGER_H_INCLUDED ! #include "FOOObjectManager.h" --- 38,42 ---- #define FOO_FOOEAGERMODULEMANAGER_H_INCLUDED ! #include <FOO/FOOObjectManager.h> Index: FOOBreakpointFunction.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOBreakpointFunction.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOBreakpointFunction.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOBreakpointFunction.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOBREAKPOINTFUNCTION_H ! #include "FOOGlobal.h" ! #include "FOOSubstrate.h" --- 38,43 ---- #define FOO_FOOBREAKPOINTFUNCTION_H ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOSubstrate.h> Index: FOOObjectManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOObjectManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOObjectManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOObjectManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 40,45 **** #import <Foundation/NSArray.h> ! #include "FOOGlobal.h" ! #include "FOOObject.h" --- 40,45 ---- #import <Foundation/NSArray.h> ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObject.h> Index: FOOSoundStream.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSoundStream.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSoundStream.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSoundStream.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOSOUNDSTREAM_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOSubstrate.h" @class FOOSoundFile; --- 38,43 ---- #define FOO_FOOSOUNDSTREAM_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOSubstrate.h> @class FOOSoundFile; Index: FOOSineTable.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOSineTable.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOSineTable.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOSineTable.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOSINETABLE_H_INCLUDED ! #include "FOOLookupTable.h" --- 38,42 ---- #define FOO_FOOSINETABLE_H_INCLUDED ! #include <FOO/FOOLookupTable.h> Index: FOOBuffer.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOBuffer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOBuffer.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOBuffer.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOBUFFER_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOObject.h" --- 38,43 ---- #define FOO_FOOBUFFER_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObject.h> Index: FOOModuleManager.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOModuleManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOModuleManager.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOModuleManager.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOMODULEMANAGER_H_INCLUDED ! #include "FOOObjectManager.h" --- 38,42 ---- #define FOO_FOOMODULEMANAGER_H_INCLUDED ! #include <FOO/FOOObjectManager.h> Index: FOOLookupTable.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOLookupTable.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOLookupTable.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOLookupTable.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOLOOKUPTABLE_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOObject.h" --- 38,43 ---- #define FOO_FOOLOOKUPTABLE_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOObject.h> Index: FOOEagerModule.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOEagerModule.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOEagerModule.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOOEagerModule.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,42 **** #define FOO_FOOEAGERMODULE_H_INCLUDED ! #include "FOOModule.h" @interface FOOEagerModule : FOOModule --- 38,42 ---- #define FOO_FOOEAGERMODULE_H_INCLUDED ! #include <FOO/FOOModule.h> @interface FOOEagerModule : FOOModule Index: FOORegion.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/FOO/FOORegion.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOORegion.h 4 Aug 2004 05:15:48 -0000 1.1 --- FOORegion.h 4 Aug 2004 06:15:57 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOREGION_H_INCLUDED ! #include "FOOGlobal.h" ! #include "FOOSubstrate.h" --- 38,43 ---- #define FOO_FOOREGION_H_INCLUDED ! #include <FOO/FOOGlobal.h> ! #include <FOO/FOOSubstrate.h> |
|
From: Martin R. <ru...@us...> - 2004-08-04 05:23:10
|
Update of /cvsroot/foo/foo/libfoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17723 Modified Files: Makefile.am configure.ac Log Message: adopted build system to new include dir Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.ac 2 Aug 2004 06:47:57 -0000 1.9 --- configure.ac 4 Aug 2004 05:23:02 -0000 1.10 *************** *** 157,161 **** FOO_LIBS="${FOO_LIBS} ${SNDFILE_LIBS}" ! INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include" AC_SUBST(INCLUDES) --- 157,161 ---- FOO_LIBS="${FOO_LIBS} ${SNDFILE_LIBS}" ! INCLUDES="${INCLUDES} -I\$(top_srcdir)/FOO -I\$(top_builddir)/FOO" AC_SUBST(INCLUDES) *************** *** 177,181 **** autotools/Makefile m4/Makefile ! include/Makefile src/Makefile modules/Makefile --- 177,181 ---- autotools/Makefile m4/Makefile ! FOO/Makefile src/Makefile modules/Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/foo/libfoo/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 31 Jul 2004 07:01:21 -0000 1.3 --- Makefile.am 4 Aug 2004 05:23:02 -0000 1.4 *************** *** 6,10 **** NULL = ! SUBDIRS = include modules src tests DIST_SUBDIRS = $(SUBDIRS) autotools m4 --- 6,10 ---- NULL = ! SUBDIRS = FOO modules src tests DIST_SUBDIRS = $(SUBDIRS) autotools m4 |
Update of /cvsroot/foo/foo/libfoo/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17609 Removed Files: FOOBreakpointFunction.h FOOBuffer.h FOOBufferManager.h FOOContext.h FOOContextPart.h FOOEagerModule.h FOOEagerModuleManager.h FOOFileTable.h FOOGlobal.h FOOGlobalsManager.h FOOLookupTable.h FOOModule.h FOOModuleManager.h FOONilModule.h FOOObject.h FOOObjectManager.h FOOOutput.h FOOOutputManager.h FOORegion.h FOOSineTable.h FOOSineXoverXTable.h FOOSoundFile.h FOOSoundStream.h FOOSubstrate.h FOOSubstrateManager.h Makefile.am Log Message: removed files in old includedir --- FOOObject.h DELETED --- --- FOOSineXoverXTable.h DELETED --- --- FOOFileTable.h DELETED --- --- FOOGlobalsManager.h DELETED --- --- FOOSubstrateManager.h DELETED --- --- FOOBufferManager.h DELETED --- --- FOOGlobal.h DELETED --- --- FOOObjectManager.h DELETED --- --- FOOSubstrate.h DELETED --- --- FOOBreakpointFunction.h DELETED --- --- FOOModule.h DELETED --- --- FOOContext.h DELETED --- --- FOOContextPart.h DELETED --- --- Makefile.am DELETED --- --- FOONilModule.h DELETED --- --- FOOSoundFile.h DELETED --- --- FOOEagerModuleManager.h DELETED --- --- FOOOutputManager.h DELETED --- --- FOOOutput.h DELETED --- --- FOOSoundStream.h DELETED --- --- FOOSineTable.h DELETED --- --- FOOBuffer.h DELETED --- --- FOOModuleManager.h DELETED --- --- FOOLookupTable.h DELETED --- --- FOOEagerModule.h DELETED --- --- FOORegion.h DELETED --- |
Update of /cvsroot/foo/foo/libfoo/FOO In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16719 Added Files: FOOBreakpointFunction.h FOOBuffer.h FOOBufferManager.h FOOContext.h FOOContextPart.h FOOEagerModule.h FOOEagerModuleManager.h FOOFileTable.h FOOGlobal.h FOOGlobalsManager.h FOOLookupTable.h FOOModule.h FOOModuleManager.h FOONilModule.h FOOObject.h FOOObjectManager.h FOOOutput.h FOOOutputManager.h FOORegion.h FOOSineTable.h FOOSineXoverXTable.h FOOSoundFile.h FOOSoundStream.h FOOSubstrate.h FOOSubstrateManager.h Makefile.am Log Message: moved headers to FOO directory to match with header install dir --- NEW FILE: FOOObject.h --- /* -*-Mode:objc-*- */ /* * FOOObject.h * * root object for FOO objects * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOObject.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOOBJECT_H_INCLUDED #define FOO_FOOOBJECT_H_INCLUDED #import <Foundation/NSObject.h> /* memory management macros for mac os x */ #ifndef RETAIN /** * Basic retain operation ... calls [NSObject-retain] */ #define RETAIN(object) [object retain] #endif #ifndef RELEASE /** * Basic release operation ... calls [NSObject-release] */ #define RELEASE(object) [object release] #endif #ifndef AUTORELEASE /** * Basic autorelease operation ... calls [NSObject-autorelease] */ #define AUTORELEASE(object) [object autorelease] #endif /* end: memory management macros for mac os x */ /* more tedious stuff for mac os x */ #ifndef NULL #define NULL (0) /* haha */ #endif /* end: more tedious stuff for mac os x */ @interface FOOObject : NSObject { } @end #endif /* #ifndef FOO_FOOOBJECT_H_INCLUDED */ --- NEW FILE: FOOSineXoverXTable.h --- /* -*-Mode:objc-*- */ /* * FOOSineXoverXTable.h * * sine x over x table * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSineXoverXTable.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOSINEXOVERXTABLE_H_INCLUDED #define FOO_FOOSINEXOVERXTABLE_H_INCLUDED #include "FOOLookupTable.h" @interface FOOSineXoverXTable : FOOLookupTable { int _taps; } - (FOOSineXoverXTable *) initWithTaps: (int)n size: (int)size; - (int) getTaps; @end #endif /* #ifndef FOO_FOOSINEXOVERXTABLE_H_INCLUDED */ --- NEW FILE: FOOFileTable.h --- /* -*-Mode:objc-*- */ /* * FOOFileTable.h * * file table * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOFileTable.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOFILETABLE_H_INCLUDED #define FOO_FOOFILETABLE_H_INCLUDED #include "FOOGlobal.h" #include "FOOLookupTable.h" @interface FOOFileTable : FOOLookupTable { } - (FOOFileTable *) initWithFile: (NSString *)name; - (int) previousPowerOfTwo: (int)n; @end #endif /* #ifndef FOO_FOOFILETABLE_H_INCLUDED */ --- NEW FILE: FOOGlobalsManager.h --- /* -*-Mode:objc-*- */ /* * FOOGlobalsManager.h * * manage globals * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOGlobalsManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOGLOBALSMANAGER_H_INCLUDED #define FOO_FOOGLOBALSMANAGER_H_INCLUDED #import <Foundation/NSString.h> #include "FOOGlobal.h" #include "FOOObject.h" @class FOOLookupTable; #define SINXOVERX_POINTS_PER_TAP 500 #define SINE_TABLESIZE 8192 // has to be a power of two ! #define DEFAULT_SAMPLING_RATE 44100 #define MINIMUM_TAPS 4 #define MAXIMUM_TAPS 50 #define DEFAULT_TAPS 10 #define DEFAULT_BSIZE 1024 @interface FOOGlobalsManager : FOOObject { } /* since this is a class, i decided to use (void) as return value * rather than self for setter-functions * what we want is a 'singleton' instance for this */ + (BOOL) trace; + (void) setTrace: (BOOL)val; // this seems not to be used in foo // + (void) loadClass: (NSString *)path; // + (void) unloadLast; + (void) schemeOutput: (NSString *)string; + (FOOLookupTable *) getSineTable; + (FOOLookupTable *) getSineXoverXTable: (int)n; + (FOOLookupTable *) getFileTable: (NSString *)filename; + (int) getDefaultTaps; + (void) setDefaultTaps: (int)taps; + (int) getMinimumTaps; + (int) getMaximumTaps; + (double) getDefaultSamplingRate; + (void) setDefaultSamplingRate: (double)rate; + (int) getDefaultBlockSize; + (void) setDefaultBlockSize: (int)size; @end #endif /* #ifndef FOO_FOOGLOBALSMANAGER_H_INCLUDED */ --- NEW FILE: FOOSubstrateManager.h --- /* -*-Mode:objc-*- */ /* * FOOSubstrateManager.h * * manager for FOOSubstrates * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSubstrateManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOSUBSTRATEMANAGER_H_INCLUDED #define FOO_FOOSUBSTRATEMANAGER_H_INCLUDED #include "FOOObjectManager.h" @interface FOOSubstrateManager : FOOObjectManager { } - (FOOSubstrateManager *) startUp; @end #endif /* #ifndef FOO_FOOSUBSTRATEMANAGER_H_INCLUDED */ --- NEW FILE: FOOBufferManager.h --- /* -*-Mode:objc-*- */ /* * FOOBufferManager.h * * manager for FOOBuffers * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOBufferManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOBUFFERMANAGER_H_INCLUDED #define FOO_FOOBUFFERMANAGER_H_INCLUDED #include "FOOGlobal.h" #include "FOOObjectManager.h" #define DEFAULT_BUFFER_SIZE 1024 @interface FOOBufferManager : FOOObjectManager { int _bufferSize; } - (FOOBufferManager *) setBufferSize: (int)size; - (int) getBufferSize; - (FOOBufferManager *) reset; @end #endif /* #ifndef FOO_FOOBUFFERMANAGER_H_INCLUDED */ --- NEW FILE: FOOGlobal.h --- /* -*-Mode:objc-*- */ /* * FOOGlobal.h * * global definitions * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOGlobal.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOGLOBAL_H_INCLUDED #define FOO_FOOGLOBAL_H_INCLUDED #include <assert.h> #include <math.h> #import <Foundation/NSString.h> #include "FOOGlobalsManager.h" typedef float sample_t; #define FOO_ERROR(ret, val) { \ NSString *_buffeR_; \ _buffeR_ = [NSString stringWithFormat: @"FOO ERROR: class: %@, file: %s, line: %d\n", \ [[self class] description], __FILE__, __LINE__]; \ AUTORELEASE(_buffeR_); \ [FOOGlobalsManager schemeOutput: _buffeR_]; \ if (ret) return val; } #define SAMPLERATE ([_context getSamplingRate]) #define SEC_TO_SAM(s) ((int) (rint((s) * SAMPLERATE))) #define SAM_TO_SEC(s) ((s) / SAMPLERATE) #endif /* #ifndef FOO_FOOGLOBAL_H_INCLUDED */ --- NEW FILE: FOOObjectManager.h --- /* -*-Mode:objc-*- */ /* * FOOObjectManager.h * * generic manager for FOOObjects * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOObjectManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOOBJECTMANAGER_H_INCLUDED #define FOO_FOOOBJECTMANAGER_H_INCLUDED #import <Foundation/NSArray.h> #include "FOOGlobal.h" #include "FOOObject.h" @interface FOOObjectManager : FOOObject { NSMutableArray* _objects; } - (FOOObjectManager *) addObject: (FOOObject *)anObject; - (FOOObjectManager *) removeObject: (FOOObject *)anObject; - (FOOObject *) objectAtIndex: (unsigned int)index; - (NSArray *) getObjects; - (Class) objectType; - (FOOObjectManager *) removeAllObjects; @end #endif /* #ifndef FOO_FOOOBJECTMANAGER_H_INCLUDED */ --- NEW FILE: FOOSubstrate.h --- /* -*-Mode:objc-*- */ /* * FOOSubstrate.h * * substrate * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSubstrate.h,v 1.1 2004/08/04 05:15:48 rumori Exp $: FOOSubstrate.h,v 1.2 2004/06/30 10:38:14 voelkel Exp $ */ #ifndef FOO_FOOSUBSTRATE_H_INCLUDED #define FOO_FOOSUBSTRATE_H_INCLUDED #include "FOOGlobal.h" #include "FOOContextPart.h" @interface FOOSubstrate : FOOContextPart { } - (long) size; - (FOOSubstrate *) doInit; /* we need a protocol here for FOOSoundFile, -Stream and -Region */ - (double) getSamplingRate; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames; @end #endif /* #ifndef FOO_FOOSUBSTRATE_H_INCLUDED */ --- NEW FILE: FOOBreakpointFunction.h --- /* -*-Mode:objc-*- */ /* * FOOBreakpointFunction.h * * breakpoint function * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOBreakpointFunction.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOBREAKPOINTFUNCTION_H #define FOO_FOOBREAKPOINTFUNCTION_H #include "FOOGlobal.h" #include "FOOSubstrate.h" double transexp (double arg); typedef struct { sample_t value; sample_t delta; double alpha; double time; int count; } lineseg_t; @interface FOOBreakpointFunction : FOOSubstrate { lineseg_t *_segments; int _length; double _beginT; double _endT; double _firstV; double _firstA; } - (FOOBreakpointFunction *) setBpf: (lineseg_t *)seglist first: (double)f begin: (double)b end: (double)e; - (double) beginT; - (double) sizeT; - (FOOBreakpointFunction *) print; - (lineseg_t *) segments; - (FOOBreakpointFunction *) copyOffset: (double)off size: (double)siz; - (FOOBreakpointFunction *) reverse; - (lineseg_t *) restoreSegments; @end #endif /* #ifndef FOO_FOOBREAKPOINTFUNCTION_H */ --- NEW FILE: FOOModule.h --- /* -*-Mode:objc-*- */ /* * FOOModule.h * * module interface * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOModule.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOMODULE_H_INCLUDED #define FOO_FOOMODULE_H_INCLUDED #include "FOOGlobal.h" #include "FOOContextPart.h" #include "FOOBuffer.h" #include "FOOContext.h" #import <Foundation/NSArray.h> #import <Foundation/NSString.h> @class FOONilModule; @class FOOConstant; #define PRINT_BUFFER_SIZE 1024 #define MAX_CLASS_NAME_SIZE 128 enum { TI_BEG_END, TI_BEG, TI_END, TI_NONE }; #define COMPUTE_PROLOGUE \ if (_active == YES) { \ if (_valid == YES) \ return _active #define COMPUTE_EPILOGUE \ _valid = YES; \ } else \ memset([_buffer data], 0, sizeof(sample_t) * BLOCKSIZE); \ return _active #define INPUTS ([_inputs count]) #define INPUT(n) ([_inputs objectAtIndex: (n)]) #define DATA_OF_MOD(m) ([[(m) getBuffer] data]) #define SAMPLETIME [_context getSampleTime] #define BLOCKSIZE [_context getBlockSize] #define BLOCKEND (SAMPLETIME + BLOCKSIZE) #define TIMEFRAME [_context getTime] @interface FOOModule : FOOContextPart { NSMutableArray *_inputs; id _output; /* NOT USED !!! */ FOOBuffer *_buffer; int _active; int _valid; BOOL _printed; } - (FOOModule *) reset; - (FOOModule *) connectInput: (int)index to: (FOOModule *)module; - (FOOModule *) connectOutput: (FOOModule *)module; - (FOOModule *) defaultInput; - (BOOL) activate; - (BOOL) compute; - (FOOBuffer *) getBuffer; - (FOOModule *) invalidate; - (FOOModule *) assignBuffers: (int)lastBuffer; - (int) incrementBuffer; - (FOOModule *) print; - (FOOModule *) printSub: (int)level : (char *)buffer; - (FOOContext *) context; - (int) getTimeInterval: (double*)b : (double*)e; - (FOOModule *) invalidatePrint; @end #endif /* #ifndef FOO_FOOMODULE_H_INCLUDED */ --- NEW FILE: FOOContext.h --- /* -*-Mode:objc-*- */ /* * FOOContext.h * * execution environment for patches * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOContext.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOCONTEXT_H_INCLUDED #define FOO_FOOCONTEXT_H_INCLUDED #include "FOOGlobal.h" #include "FOOObject.h" @class FOOObjectManager; @class FOOGlobalsManager; @class FOOModuleManager; @class FOOEagerModuleManager; @class FOOSubstrateManager; @class FOOOutputManager; @class FOOBufferManager; @class FOONilModule; @class FOOEagerModule; @class FOOOutput; @class FOOModule; @class FOOSubstrate; @class FOOBuffer; // extern id getCurrentContext(); // exported by ../objc/context.m @interface FOOContext : FOOObject { double _time; double _samplingRate; int _sampleTime; int _bufferSize; int _blockSize; /* current computation block size */ BOOL _locked; int _numberOfSharedBuffers; int _numberOfChannels; int _debugFlag; FOOModuleManager *_moduleManager; FOOEagerModuleManager *_eagerModuleManager; FOOSubstrateManager *_substrateManager; FOOOutputManager *_outputManager; FOOBufferManager *_volatileBufferManager; FOOBufferManager *_sharedBufferManager; FOONilModule *_nilModule; } - (FOOContext *) initWithChans: (int)n; - (FOOContext *) setTime: (double)value; - (double) getTime; - (int) getSampleTime; - (FOOObjectManager *) addModule: (FOOObject *) aModule; - (FOOObjectManager *) addEagerModule: (FOOObject *) aModule; - (FOOObjectManager *) addSubstrate: (FOOObject *) aSubstrate; - (FOOObjectManager *) removeSubstrate: (FOOObject *) aSubstrate; - (FOOObjectManager *) addOutput: (FOOObject *) anOutput; - (FOOBuffer *) bufferAtIndex: (int)index; - (FOOBuffer *) nextSharedBuffer; - (FOOContext *) setBufferSize: (int)size; - (int) getBufferSize; - (int) getBlockSize; - (int) getNumberOfChannels; - (FOOContext *) setDebugFlag: (int)flag; - (int) getDebugFlag; - (FOOContext *) compile; - (FOOContext *) step; - (int) run: (int)samples factor: (double)factor; - (FOOContext *) reset; - (double) getMaximum: (int)chan; - (FOOContext *) openOutput: (NSString *)path addin: (int)flag at: (int)ref; - (FOOContext *) closeOutput; - (double) getSamplingRate; - (FOOContext *) setSamplingRate: (double)newRate; - (FOOContext *) setSampleTime: (int)offset; - (BOOL) isLocked; - (int) getTimeInterval: (double*)b : (double*)e; - (FOOContext *) invalidatePrint; - (FOONilModule *) getNilModule; @end #endif /* #ifndef FOO_FOOCONTEXT_H_INCLUDED */ --- NEW FILE: FOOContextPart.h --- /* -*-Mode:objc-*- */ /* * FOOContextPart.h * * part of a FOOContext * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOContextPart.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOCONTEXTPART_H_INCLUDED #define FOO_FOOCONTEXTPART_H_INCLUDED #include "FOOObject.h" @class FOOContext; @interface FOOContextPart : FOOObject { FOOContext *_context; } - (FOOContextPart *) initWithContext: (FOOContext *)aContext; - (FOOContextPart *) startUp; - (FOOContextPart *) reset; @end #endif /* #ifndef FOO_FOOCONTEXTPART_H_INCLUDED */ --- NEW FILE: Makefile.am --- # foo/libfoo/FOO/Makefile.am # 2004 rumori # $Id: Makefile.am,v 1.1 2004/08/04 05:15:48 rumori Exp $ NULL = pkgincludedir = $(includedir)/FOO pkginclude_HEADERS = \ FOOBreakpointFunction.h \ FOOBuffer.h \ FOOBufferManager.h \ FOOContext.h \ FOOContextPart.h \ FOOEagerModule.h \ FOOEagerModuleManager.h \ FOOFileTable.h \ FOOGlobal.h \ FOOGlobalsManager.h \ FOOLookupTable.h \ FOOModule.h \ FOOModuleManager.h \ FOONilModule.h \ FOOObject.h \ FOOObjectManager.h \ FOOOutput.h \ FOOOutputManager.h \ FOORegion.h \ FOOSineTable.h \ FOOSineXoverXTable.h \ FOOSoundFile.h \ FOOSoundStream.h \ FOOSubstrate.h \ FOOSubstrateManager.h \ $(NULL) nodist_pkginclude_HEADERS = \ $(NULL) --- NEW FILE: FOONilModule.h --- /* -*-Mode:objc-*- */ /* * FOONilModule.h * * * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOONilModule.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOONILMODULE_H_INCLUDED #define FOO_FOONILMODULE_H_INCLUDED #include "FOOObject.h" @interface FOONilModule : FOOObject { } @end #endif /* #ifndef FOO_FOONILMODULE_H_INCLUDED */ --- NEW FILE: FOOSoundFile.h --- /* -*-Mode:objc-*- */ /* * FOOSoundFile.h * * soundfile * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSoundFile.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOSOUNDFILE_H_INCLUDED #define FOO_FOOSOUNDFILE_H_INCLUDED #include "FOOGlobal.h" #include "FOOSubstrate.h" #import <Foundation/NSString.h> #include <sndfile.h> typedef struct { double minValue; sf_count_t minFrame; double maxValue; sf_count_t maxFrame; } dynamics_t; typedef struct { sample_t *ptr; // pointer to cache start sample_t *pos; // current cache position sf_count_t capacityB; // capacity in bytes sf_count_t capacityS; // capacity in samples sf_count_t capacityF; // capacity in frames sf_count_t firstF; // first frame in cache (at start) is frame // firstF in sndfile sf_count_t lastF; // last frame in cache + 1 (at start + capacityB) sf_count_t firstDirtyF; // first dirty frame of file. -1: nothing to flush sf_count_t lastDirtyF; // last dirty frame of file } cache_t; enum {SND_READ, SND_WRITE, SND_ADDIN}; @interface FOOSoundFile : FOOSubstrate { NSString *_fileName; SNDFILE *_file; SF_INFO _fileInfo; sf_count_t _fileFrames; int _fileMode; cache_t _cache; dynamics_t *_dynamics; size_t _frameSizeB; // frame size in bytes BOOL _lazyWrite; // flush after every putSamples? BOOL _dynamicsValid; } - (FOOSoundFile *) initWithFile: (NSString *)name; - (BOOL) open: (NSString *)name mode: (int)sndmode; - (BOOL) isOpen; - (BOOL) close; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel rev: (BOOL)reversed; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames rev: (BOOL)reversed; /* to be removed * no in FOOSubstrate.h * - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames; */ - (BOOL) putSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; - (BOOL) lazyWrite; - setLazyWrite: (BOOL)flag; - (dynamics_t *) dynamics; - validateDynamics; - (double) getSamplingRate; - (int) getChannelCount; - (int) getDataFormat; - (int) getFileType; - (long) size; - setCacheCapacity: (sf_count_t)frames; - prepareCache: (sf_count_t)fromFrame; - (BOOL) flush; @end #endif /* #ifndef FOO_FOOSOUNDFILE_H_INCLUDED */ --- NEW FILE: FOOEagerModuleManager.h --- /* -*-Mode:objc-*- */ /* * FOOEagerModuleManager.h * * manager for FOOEagerModules * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOEagerModuleManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOEAGERMODULEMANAGER_H_INCLUDED #define FOO_FOOEAGERMODULEMANAGER_H_INCLUDED #include "FOOObjectManager.h" @interface FOOEagerModuleManager : FOOObjectManager { } - (FOOEagerModuleManager *) step; @end #endif /* #ifndef FOO_FOOEAGERMODULEMANAGER_H_INCLUDED */ --- NEW FILE: FOOOutputManager.h --- /* -*-Mode:objc-*- */ /* * FOOOutputManager.h * * manager for FOOOutputs * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOOutputManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOOUTPUTMANAGER_H_INCLUDED #define FOO_FOOOUTPUTMANAGER_H_INCLUDED #include "FOOGlobal.h" #include "FOOObjectManager.h" #import <Foundation/NSString.h> #import <Foundation/NSArray.h> @class FOOContext; @class FOOSoundFile; @class FOOBuffer; @interface FOOOutputManager : FOOObjectManager { FOOContext *_context; FOOSoundFile *_soundfile; NSMutableArray *_buffers; NSMutableArray *_caches; NSMutableArray *_outputs; BOOL _incremental; NSString *_filename; int _channels; int _bufferSize; int _cacheSize; int _outputSize; int _position; double _outputPosition; double _scaler; double _factor; int _taps; int _cacheOffset; } - (FOOOutputManager *) initWithContext: (FOOContext *)aContext; - (FOOOutputManager *) output: (FOOBuffer *)buffer channel: (int)chan; - (FOOOutputManager *) open: (NSString *)path addin: (BOOL)flag; - (FOOOutputManager *) setBufferSize: (int)s; - (FOOOutputManager *) setCacheSize: (int)s; - (FOOOutputManager *) setOutputSize: (int)s; - (FOOOutputManager *) write; - (int) resample:(sample_t*)i to:(sample_t*)o; - (BOOL) flush; - (BOOL) close; - (int) getNumberOfChannels; - (FOOOutputManager *) compile; - (FOOOutputManager *) step; - (FOOOutputManager *) setOutputTime: (int)offset; - (FOOOutputManager *) setScaler: (double)scal; - (FOOOutputManager *) reset; - (double) getMaximum: (int)chan; @end #endif /* #ifndef FOO_FOOOUTPUTMANAGER_H_INCLUDED */ --- NEW FILE: FOOOutput.h --- /* -*-Mode:objc-*- */ /* * FOOOutput.h * * output module * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOOutput.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOOUTPUT_H_INCLUDED #define FOO_FOOOUTPUT_H_INCLUDED #include "FOOGlobal.h" #include "FOOContextPart.h" @class FOOOutputManager; @class FOOModule; @interface FOOOutput : FOOContextPart { FOOModule *_input; int _channel; } - (FOOOutput *) initWithChannel: (int)chan; - (FOOOutput *) connect: (FOOModule *) aModule; - (FOOOutput *) output: (FOOOutputManager *) outputManager; - (FOOOutput *) assignBuffers; @end #endif /* #ifndef FOO_FOOOUTPUT_H_INCLUDED */ --- NEW FILE: FOOSoundStream.h --- /* -*-Mode:objc-*- */ /* * FOOSoundStream.h * * soundstream * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSoundStream.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOSOUNDSTREAM_H_INCLUDED #define FOO_FOOSOUNDSTREAM_H_INCLUDED #include "FOOGlobal.h" #include "FOOSubstrate.h" @class FOOSoundFile; @class FOOGlobal; @interface FOOSoundStream : FOOSubstrate { FOOSoundFile *_soundFile; int _channelNumber; } - (FOOSoundStream *) initWithSubstrate: (FOOSubstrate *)substrate channel: (int) channel; /* to be removed * no in FOOSubstrate.h * - (BOOL) getSamples: (sample_t *)buffer offset: (long)off size: (long)size; */ - (long) size; - (double) getSamplingRate; @end #endif /* #ifndef FOO_FOOSOUNDSTREAM_H_INCLUDED */ --- NEW FILE: FOOSineTable.h --- /* -*-Mode:objc-*- */ /* * FOOSineTable.h * * sine table * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOSineTable.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOSINETABLE_H_INCLUDED #define FOO_FOOSINETABLE_H_INCLUDED #include "FOOLookupTable.h" @interface FOOSineTable : FOOLookupTable { } @end #endif /* #ifndef FOO_FOOSINETABLE_H_INCLUDED */ --- NEW FILE: FOOBuffer.h --- /* -*-Mode:objc-*- */ /* * FOOBuffer.h * * sample data bufer * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOBuffer.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOBUFFER_H_INCLUDED #define FOO_FOOBUFFER_H_INCLUDED #include "FOOGlobal.h" #include "FOOObject.h" #define BUFFER_NOT_ASSIGNED nil #define DATA_OF_BUF(b) ([(b) data]) // let's deprecate this in the future @interface FOOBuffer : FOOObject { unsigned int _size; sample_t *_data; BOOL _shared; } - (FOOBuffer *) initWithSize: (unsigned int)size; - (unsigned int) count; - (sample_t *) data; - (BOOL) isShared; - (FOOBuffer *) setShared: (BOOL)shared; - (FOOBuffer *) setSize: (unsigned int)samples; - (FOOBuffer *) set: (sample_t)value; - (FOOBuffer *) zero; - (FOOBuffer *) mov: (FOOBuffer *)b; - (FOOBuffer *) add: (FOOBuffer *)b; - (FOOBuffer *) sub: (FOOBuffer *)b; - (FOOBuffer *) mul: (FOOBuffer *)b; - (FOOBuffer *) scale: (double)scaler; - (FOOBuffer *) add: (FOOBuffer *)b scaled: (double)scaler; - (FOOBuffer *) div: (FOOBuffer *)b; @end #endif /* #ifndef FOO_FOOBUFFER_H_INCLUDED */ --- NEW FILE: FOOModuleManager.h --- /* -*-Mode:objc-*- */ /* * FOOModuleManager.h * * manager for FOOModules * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOModuleManager.h,v 1.1 2004/08/04 05:15:48 rumori Exp $: FOOModuleManager.h,v 1.2 2004/06/30 10:38:14 voelkel Exp $ */ #ifndef FOO_FOOMODULEMANAGER_H_INCLUDED #define FOO_FOOMODULEMANAGER_H_INCLUDED #include "FOOObjectManager.h" @interface FOOModuleManager : FOOObjectManager { } - (FOOModuleManager *) startUp; - (FOOModuleManager *) reset; - (FOOModuleManager *) invalidateModules; - (FOOModuleManager *) invalidatePrint; - (int) getTimeInterval: (double*)b : (double*)e; @end #endif /* #ifndef FOO_FOOMODULEMANAGER_H_INCLUDED */ --- NEW FILE: FOOLookupTable.h --- /* -*-Mode:objc-*- */ /* * FOOLookupTable.h * * generic lookup table * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOLookupTable.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOLOOKUPTABLE_H_INCLUDED #define FOO_FOOLOOKUPTABLE_H_INCLUDED #include "FOOGlobal.h" #include "FOOObject.h" @interface FOOLookupTable : FOOObject { int _size; double _origin; double _scaler; sample_t *_base; sample_t *_delta; } - (FOOLookupTable *) initWithOrigin: (double)origin extent: (double)extent size: (double)size; - (double) lookup: (double)x; - (double) function: (double)x; - (int) getSize; - (double) getOrigin; - (double) getExtent; - (double) getScaler; - (sample_t *) getBase; - (sample_t *) getDelta; @end #endif /* #ifndef FOO_FOOLOOKUPTABLE_H_INCLUDED */ --- NEW FILE: FOOEagerModule.h --- /* -*-Mode:objc-*- */ /* * FOOEagerModule.h * * eagerModule interface * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOOEagerModule.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOEAGERMODULE_H_INCLUDED #define FOO_FOOEAGERMODULE_H_INCLUDED #include "FOOModule.h" @interface FOOEagerModule : FOOModule { } - (FOOEagerModule *) step; @end #endif /* #ifndef FOO_FOOEAGERMODULE_H_INCLUDED */ --- NEW FILE: FOORegion.h --- /* -*-Mode:objc-*- */ /* * FOORegion.h * * sound region * */ /* * foo sound synthesis system * * (C)1993-2004 Gerhard Eckel, Ramon Gonzalez-Arroyo, IRCAM, ZKM * (C)2003-2004 Martin Rumori */ /* * This file is part of foo. * * foo is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * foo is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with foo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* $Id: FOORegion.h,v 1.1 2004/08/04 05:15:48 rumori Exp $ */ #ifndef FOO_FOOREGION_H_INCLUDED #define FOO_FOOREGION_H_INCLUDED #include "FOOGlobal.h" #include "FOOSubstrate.h" @interface FOORegion : FOOSubstrate { /* Substrate *substrate; // statically typed */ FOOSubstrate *_substrate; long _offset; long _size; BOOL _reverse; } - (FOORegion *) initWithSubstrate: (FOOSubstrate *)substrate offset: (double)off size: (double)siz rev: (BOOL)rev; /* to be removed * no in FOOSubstrate.h * - (BOOL) getSamples: (sample_t *)buffer offset: (long)off size: (long)size; */ - (long) size; - (double) getSamplingRate; @end #endif /* #ifndef FOO_FOOREGION_H_INCLUDED */ |
|
From: Martin R. <ru...@us...> - 2004-08-04 05:15:08
|
Update of /cvsroot/foo/foo/libfoo/FOO In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16572/FOO Log Message: Directory /cvsroot/foo/foo/libfoo/FOO added to the repository |
|
From: Martin R. <ru...@us...> - 2004-08-02 06:48:05
|
Update of /cvsroot/foo/foo/libfoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11185 Modified Files: configure.ac Log Message: show GNU/NeXT objc-runtime info in configuration summary Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 2 Aug 2004 06:39:44 -0000 1.8 --- configure.ac 2 Aug 2004 06:47:57 -0000 1.9 *************** *** 190,193 **** --- 190,194 ---- ---------------------------- libfoo version: ${VERSION} + objective-c runtime: ${OBJC_RUNTIME} foundation framework: ${use_foundation} |
|
From: Martin R. <ru...@us...> - 2004-08-02 06:39:52
|
Update of /cvsroot/foo/foo/libfoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10125 Modified Files: acinclude.m4 configure.ac Log Message: added ObjC-runtime detection test Index: acinclude.m4 =================================================================== RCS file: /cvsroot/foo/foo/libfoo/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acinclude.m4 31 Jul 2004 04:09:18 -0000 1.2 --- acinclude.m4 2 Aug 2004 06:39:44 -0000 1.3 *************** *** 5,6 **** --- 5,7 ---- builtin(include,m4/objc.m4) + builtin(include,m4/objc-runtime.m4) Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.ac 2 Aug 2004 02:20:58 -0000 1.7 --- configure.ac 2 Aug 2004 06:39:44 -0000 1.8 *************** *** 60,63 **** --- 60,66 ---- AM_CONDITIONAL(NATIVE_BUILD, test "${cross_compiling}" = "no") + # Check for ObjC-runtime + OD_OBJC_RUNTIME + # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST |
|
From: Martin R. <ru...@us...> - 2004-08-02 06:39:28
|
Update of /cvsroot/foo/foo/libfoo/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10086 Modified Files: Makefile.am Added Files: objc-runtime.m4 Log Message: added m4 macro for ObjC runtime lib detection Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/foo/libfoo/m4/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 2 Aug 2004 02:20:33 -0000 1.3 --- Makefile.am 2 Aug 2004 06:39:20 -0000 1.4 *************** *** 8,10 **** --- 8,11 ---- EXTRA_DIST = \ objc.m4 \ + objc-runtime.m4 \ $(NULL) --- NEW FILE: objc-runtime.m4 --- #------------------------------------------------------------------------ # OD_OBJC_RUNTIME -- # # Determine the default, working Objective C runtime # # Arguments: # None. # # Requires: # none # # Depends: # AC_PROG_OBJC from objc.m4 # # Results: # # Adds a --with-objc-runtime switch to configure. # Result is cached. # # Defines one of the following preprocessor macros: # NeXT_RUNTIME GNU_RUNTIME #------------------------------------------------------------------------ AC_DEFUN([OD_OBJC_RUNTIME],[ AC_REQUIRE([AC_PROG_OBJC]) AC_ARG_WITH(objc-runtime, [ --with-objc-runtime Specify either "GNU" or "NeXT"], [with_objc_runtime=${withval}]) if test x"${with_objc_runtime}" != x; then case "${with_objc_runtime}" in GNU) ;; NeXT) ;; *) AC_MSG_ERROR([${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either "GNU" or "NeXT"]) ;; esac fi AC_LANG_PUSH([Objective C]) # Check for common header, objc/objc.h AC_CHECK_HEADERS([objc/objc.h], ,[AC_MSG_ERROR([Can't locate Objective C runtime headers])]) # Add -lobjc. The following tests will ensure that the library exists and functions with the detected Objective C compiler # If the tests fail, AC_MSG_FAILURE is called, and $LIBS does not need to be restored LIBS="${LIBS} -lobjc" if test x"${with_objc_runtime}" == x || test x"${with_objc_runtime}" == x"NeXT"; then AC_MSG_CHECKING([for NeXT Objective C runtime]) AC_CACHE_VAL(ac_cv_objc_runtime_next, [ # The following uses quadrigraphs # '@<:@' = '[' # '@:>@' = ']' AC_LINK_IFELSE([ AC_LANG_PROGRAM([ #include <objc/objc.h> #include <objc/objc-api.h> ], [ id class = objc_lookUpClass("Object"); id obj = @<:@class alloc@:>@; puts(@<:@obj name@:>@); ]) ], [ ac_cv_objc_runtime_next="yes" ], [ ac_cv_objc_runtime_next="no" ] ) ]) AC_MSG_RESULT(${ac_cv_objc_runtime_next}) else ac_cv_objc_runtime_next="no" fi if test x"${with_objc_runtime}" == x || test x"${with_objc_runtime}" == x"GNU"; then AC_MSG_CHECKING([for GNU Objective C runtime]) AC_CACHE_VAL(ac_cv_objc_runtime_gnu, [ # The following uses quadrigraphs # '@<:@' = '[' # '@:>@' = ']' AC_LINK_IFELSE([ AC_LANG_PROGRAM([ #include <objc/objc.h> #include <objc/objc-api.h> ], [ id class = objc_lookup_class("Object"); id obj = @<:@class alloc@:>@; puts(@<:@obj name@:>@); ]) ], [ ac_cv_objc_runtime_gnu="yes" ], [ ac_cv_objc_runtime_gnu="no" ] ) ]) AC_MSG_RESULT(${ac_cv_objc_runtime_gnu}) else ac_cv_objc_runtime_gnu="no" fi # NeXT runtime is prefered if test x"${ac_cv_objc_runtime_next}" == x"yes"; then OBJC_RUNTIME="NeXT" OBJC_RUNTIME_FLAGS="-fnext-runtime" AC_MSG_NOTICE([Using NeXT Objective C runtime]) AC_DEFINE([NeXT_RUNTIME], 1, [Define if using the NeXT Objective C runtime and compiler.]) elif test x"${ac_cv_objc_runtime_gnu}" == x"yes"; then OBJC_RUNTIME="GNU" OBJC_RUNTIME_FLAGS="-fgnu-runtime" AC_MSG_NOTICE([Using GNU Objective C runtime]) AC_DEFINE([GNU_RUNTIME], 1, [Define if using the GNU Objective C runtime and compiler.]) else AC_MSG_FAILURE([Could not locate a working Objective C runtime.]) fi AC_LANG_POP([Objective C]) ]) |
|
From: Martin R. <ru...@us...> - 2004-08-02 02:21:07
|
Update of /cvsroot/foo/foo/libfoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12225 Modified Files: configure.ac Log Message: changed release and versioning information Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure.ac 2 Aug 2004 00:30:06 -0000 1.6 --- configure.ac 2 Aug 2004 02:20:58 -0000 1.7 *************** *** 6,10 **** # $Id$ ! AC_INIT(libfoo,0.1.0,foo...@li...) AC_PREREQ(2.53) --- 6,10 ---- # $Id$ ! AC_INIT(libfoo,0.1.0pre1,foo...@li...) AC_PREREQ(2.53) *************** *** 15,19 **** AM_CONFIG_HEADER(src/config.h) ! SHARED_VERSION_INFO="0:1:0" AC_CHECK_PROG(autogen, autogen, yes, no) --- 15,47 ---- AM_CONFIG_HEADER(src/config.h) ! dnl Here are a set of rules to help you update your library version ! dnl information: ! ! dnl 1. Start with version information of `0:0:0' for each libtool library. ! ! dnl 2. Update the version information only immediately before a public ! dnl release of your software. More frequent updates are unnecessary, ! dnl and only guarantee that the current interface number gets larger ! dnl faster. ! ! dnl 3. If the library source code has changed at all since the last ! dnl update, then increment REVISION (`C:R:A' becomes `C:r+1:A'). ! ! dnl 4. If any interfaces have been added, removed, or changed since the ! dnl last update, increment CURRENT, and set REVISION to 0. ! ! dnl 5. If any interfaces have been added since the last public release, ! dnl then increment AGE. ! ! dnl 6. If any interfaces have been removed since the last public release, ! dnl then set AGE to 0. ! ! dnl *_Never_* try to set the interface numbers so that they correspond ! dnl to the release number of your package. This is an abuse that only ! dnl fosters misunderstanding of the purpose of library versions. Instead, ! dnl use the `-release' flag (Note: Release numbers), but be warned that ! dnl every release of your package will not be binary compatible with any ! dnl other release. ! SHARED_VERSION_INFO="0:0:0" AC_CHECK_PROG(autogen, autogen, yes, no) |
|
From: Martin R. <ru...@us...> - 2004-08-02 02:20:42
|
Update of /cvsroot/foo/foo/libfoo/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12172 Modified Files: Makefile.am Log Message: added objc.m4 to EXTRA_DIST (in order to include it in tarballs made with make dist) Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/foo/libfoo/m4/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 31 Jul 2004 04:09:19 -0000 1.2 --- Makefile.am 2 Aug 2004 02:20:33 -0000 1.3 *************** *** 3,4 **** --- 3,10 ---- # $Id$ + + NULL = + + EXTRA_DIST = \ + objc.m4 \ + $(NULL) |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:57:15
|
Update of /cvsroot/foo/foo/libfoo/tests/foosine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1741 Modified Files: Makefile.am Log Message: -lobjc not necessary if libfoo is linked correctly Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/foo/libfoo/tests/foosine/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 31 Jul 2004 08:10:20 -0000 1.3 --- Makefile.am 2 Aug 2004 00:56:57 -0000 1.4 *************** *** 29,32 **** foosine_LDFLAGS = $(FOO_LDFLAGS) foosine_LDADD = $(FOO_LIBS) $(FND_LIBS) \ - -lobjc \ ../../src/libfoo.la --- 29,31 ---- |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:44:32
|
Update of /cvsroot/foo/foo/libfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32638 Modified Files: FOOModuleManager.m Log Message: [makeObjectsPerform:] -> [makeObjectsPerformSelector:] Index: FOOModuleManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOModuleManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOModuleManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOModuleManager.m 2 Aug 2004 00:44:20 -0000 1.2 *************** *** 73,79 **** - invalidatePrint { ! [_objects makeObjectsPerform: @selector(invalidatePrint)]; ! return self; } --- 73,79 ---- - invalidatePrint { ! [_objects makeObjectsPerformSelector: @selector(invalidatePrint)]; ! return self; } |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:43:24
|
Update of /cvsroot/foo/foo/libfoo/modules/orthodox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32492 Modified Files: FOOMReadTranspSnd.m Log Message: removed return statement from - dealloc (since void) Index: FOOMReadTranspSnd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadTranspSnd.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOMReadTranspSnd.m 1 Aug 2004 23:39:20 -0000 1.2 --- FOOMReadTranspSnd.m 2 Aug 2004 00:43:15 -0000 1.3 *************** *** 110,114 **** } ! return [super dealloc]; } --- 110,114 ---- } ! [super dealloc]; } |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:39:09
|
Update of /cvsroot/foo/foo/libfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31975 Modified Files: FOOLookupTable.m FOOModule.m FOOObjectManager.m FOOSubstrate.m Log Message: replaced [subclassResponsibility] with FOO_ERROR. (not present on mac os x, but throws an exeption with gnustep anyway) Index: FOOSubstrate.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSubstrate.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOSubstrate.m 1 Aug 2004 23:41:15 -0000 1.2 --- FOOSubstrate.m 2 Aug 2004 00:39:00 -0000 1.3 *************** *** 67,75 **** - (long) size { ! [self subclassResponsibility: _cmd]; ! return 0; } --- 67,77 ---- + /* we need a protocol here for FOOSoundFile, -Stream and -Region + instead of this method */ - (long) size { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, 0); } *************** *** 79,85 **** - (double) getSamplingRate { ! [self subclassResponsibility: _cmd]; ! return 0.; } --- 81,87 ---- - (double) getSamplingRate { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, 0.); } *************** *** 91,97 **** size: (long)frames { ! [self subclassResponsibility: _cmd]; ! return NO; } --- 93,99 ---- size: (long)frames { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, NO); } Index: FOOLookupTable.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOLookupTable.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOLookupTable.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOLookupTable.m 2 Aug 2004 00:39:00 -0000 1.2 *************** *** 87,93 **** - (double) function: (double)x { ! [self subclassResponsibility: _cmd]; ! return 0; } --- 87,93 ---- - (double) function: (double)x { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, 0.); } Index: FOOModule.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOModule.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FOOModule.m 1 Aug 2004 23:52:08 -0000 1.2 --- FOOModule.m 2 Aug 2004 00:39:00 -0000 1.3 *************** *** 102,108 **** - (BOOL) activate { ! [self subclassResponsibility: _cmd]; ! return NO; } --- 102,108 ---- - (BOOL) activate { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, NO); } *************** *** 110,116 **** - (BOOL) compute { ! [self subclassResponsibility: _cmd]; ! return NO; } --- 110,116 ---- - (BOOL) compute { ! // [self subclassResponsibility: _cmd]; ! FOO_ERROR(YES, NO); } Index: FOOObjectManager.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOObjectManager.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOObjectManager.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOObjectManager.m 2 Aug 2004 00:39:00 -0000 1.2 *************** *** 106,110 **** - (Class) objectType { ! return [self subclassResponsibility:_cmd]; } --- 106,112 ---- - (Class) objectType { ! // return [self subclassResponsibility:_cmd]; ! ! FOO_ERROR(YES, nil); } |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:30:16
|
Update of /cvsroot/foo/foo/libfoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30815 Modified Files: configure.ac Log Message: added FOO_GNUSTEP und FOO_COCOA defines to config.h Index: configure.ac =================================================================== RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.ac 31 Jul 2004 08:10:20 -0000 1.5 --- configure.ac 2 Aug 2004 00:30:06 -0000 1.6 *************** *** 58,61 **** --- 58,62 ---- ;; *linux*) + AC_DEFINE(SYS_LINUX, 1, Define if the system is Linux) enable_gnustep=yes; ;; *************** *** 97,100 **** --- 98,102 ---- use_foundation="GNUstep" + AC_DEFINE(FOO_GNUSTEP, 1, Define if we are using GNUstep) FOO_GNUSTEP_OBJCFLAGS="\$(GNUSTEP_HEADERS_FLAGS) \$(AUXILIARY_OBJCFLAGS)" FOO_GNUSTEP_LDFLAGS="\$(GNUSTEP_LIBRARIES_FLAGS)" *************** *** 105,108 **** --- 107,111 ---- use_foundation="Cocoa" + AC_DEFINE(FOO_COCOA, 1, Define if we are using Cocoa) fi AM_CONDITIONAL(USE_GNUSTEP_BASE, test "$use_gnustep_base" = yes) |
|
From: Martin R. <ru...@us...> - 2004-08-02 00:08:28
|
Update of /cvsroot/foo/foo/libfoo/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27303 Modified Files: FOOGlobal.h Log Message: [class name] -> [class description], %s -> %@ Index: FOOGlobal.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/include/FOOGlobal.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOGlobal.h 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOGlobal.h 2 Aug 2004 00:08:19 -0000 1.2 *************** *** 48,53 **** #define FOO_ERROR(ret, val) { \ NSString *_buffeR_; \ ! _buffeR_ = [NSString stringWithFormat: @"FOO ERROR: class: %s, file: %s, line: %d\n", \ ! [[self class] name], __FILE__, __LINE__]; \ AUTORELEASE(_buffeR_); \ [FOOGlobalsManager schemeOutput: _buffeR_]; \ --- 48,53 ---- #define FOO_ERROR(ret, val) { \ NSString *_buffeR_; \ ! _buffeR_ = [NSString stringWithFormat: @"FOO ERROR: class: %@, file: %s, line: %d\n", \ ! [[self class] description], __FILE__, __LINE__]; \ AUTORELEASE(_buffeR_); \ [FOOGlobalsManager schemeOutput: _buffeR_]; \ |
|
From: Martin R. <ru...@us...> - 2004-08-01 23:52:19
|
Update of /cvsroot/foo/foo/libfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24992 Modified Files: FOOModule.m Log Message: remade change [class name] to [class description] (was lost) and added conversion to cString (in order to print correctly) Index: FOOModule.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOModule.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOModule.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOModule.m 1 Aug 2004 23:52:08 -0000 1.2 *************** *** 210,214 **** // { // sprintf(printBuffer + level, "(%s [%.6lg]", ! // [[self class] name], // (double)[((FOOConstant*)self) getValue]); // } --- 210,214 ---- // { // sprintf(printBuffer + level, "(%s [%.6lg]", ! // [[[self class] description] cString], // (double)[((FOOConstant*)self) getValue]); // } *************** *** 216,220 **** { ! sprintf(printBuffer + level, "(%s", [[self class] name]); } } --- 216,220 ---- { ! sprintf(printBuffer + level, "(%s", [[[self class] description] cString]); } } *************** *** 224,233 **** { sprintf(printBuffer + level, ! "(%s <%08x>", [[self class] name], (unsigned int)_buffer); } else { sprintf(printBuffer + level, ! "(*%s <%08x>", [[self class] name], (unsigned int)_buffer); } } --- 224,233 ---- { sprintf(printBuffer + level, ! "(%s <%08x>", [[[self class] description] cString], (unsigned int)_buffer); } else { sprintf(printBuffer + level, ! "(*%s <%08x>", [[[self class] description] cString], (unsigned int)_buffer); } } |
|
From: Martin R. <ru...@us...> - 2004-08-01 23:41:23
|
Update of /cvsroot/foo/foo/libfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23779/src Modified Files: FOORegion.m FOOSoundStream.m FOOSubstrate.m Log Message: fixed some warnings Index: FOOSubstrate.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSubstrate.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSubstrate.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSubstrate.m 1 Aug 2004 23:41:15 -0000 1.2 *************** *** 67,71 **** ! - (int) size { [self subclassResponsibility: _cmd]; --- 67,71 ---- ! - (long) size { [self subclassResponsibility: _cmd]; *************** *** 85,87 **** --- 85,98 ---- + /* we need a protocol here for FOOSoundFile, -Stream and -Region + instead of this method */ + - (BOOL) getSamples: (sample_t *)buffer + offset: (long)fromFrame + size: (long)frames + { + [self subclassResponsibility: _cmd]; + + return NO; + } + @end Index: FOORegion.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOORegion.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOORegion.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOORegion.m 1 Aug 2004 23:41:15 -0000 1.2 *************** *** 68,76 **** - (BOOL) getSamples: (sample_t *)buffer ! offset: (int)off ! size: (int)size { sample_t tmp, *e, *b; ! int n; if (_reverse == YES) --- 68,76 ---- - (BOOL) getSamples: (sample_t *)buffer ! offset: (long)off ! size: (long)size { sample_t tmp, *e, *b; ! long n; if (_reverse == YES) *************** *** 100,104 **** ! - (int) size { return _size; --- 100,104 ---- ! - (long) size { return _size; Index: FOOSoundStream.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/src/FOOSoundStream.m,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSoundStream.m 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSoundStream.m 1 Aug 2004 23:41:15 -0000 1.2 *************** *** 60,65 **** - (BOOL) getSamples: (sample_t *)b ! offset:(int)o ! size:(int)s { return [_soundFile getSamples: b --- 60,65 ---- - (BOOL) getSamples: (sample_t *)b ! offset:(long)o ! size:(long)s { return [_soundFile getSamples: b *************** *** 70,74 **** ! - (int) size { return [_soundFile size]; --- 70,74 ---- ! - (long) size { return [_soundFile size]; |
|
From: Martin R. <ru...@us...> - 2004-08-01 23:41:23
|
Update of /cvsroot/foo/foo/libfoo/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23779/include Modified Files: FOORegion.h FOOSoundFile.h FOOSoundStream.h FOOSubstrate.h Log Message: fixed some warnings Index: FOOSoundFile.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/include/FOOSoundFile.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSoundFile.h 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSoundFile.h 1 Aug 2004 23:41:14 -0000 1.2 *************** *** 38,43 **** #define FOO_FOOSOUNDFILE_H_INCLUDED - #include "FOOSubstrate.h" #include "FOOGlobal.h" #import <Foundation/NSString.h> --- 38,43 ---- #define FOO_FOOSOUNDFILE_H_INCLUDED #include "FOOGlobal.h" + #include "FOOSubstrate.h" #import <Foundation/NSString.h> *************** *** 93,97 **** - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames rev: (BOOL)reversed; ! - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames; - (BOOL) putSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; --- 93,100 ---- - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames rev: (BOOL)reversed; ! /* to be removed ! * no in FOOSubstrate.h ! * - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames; ! */ - (BOOL) putSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames channel: (int)channel; Index: FOOSoundStream.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/include/FOOSoundStream.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSoundStream.h 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSoundStream.h 1 Aug 2004 23:41:14 -0000 1.2 *************** *** 52,57 **** - (FOOSoundStream *) initWithSubstrate: (FOOSubstrate *)substrate channel: (int) channel; ! - (BOOL) getSamples: (sample_t *)b offset: (int)o size: (int)s; ! - (int) size; - (double) getSamplingRate; --- 52,62 ---- - (FOOSoundStream *) initWithSubstrate: (FOOSubstrate *)substrate channel: (int) channel; ! ! /* to be removed ! * no in FOOSubstrate.h ! * - (BOOL) getSamples: (sample_t *)buffer offset: (long)off size: (long)size; ! */ ! ! - (long) size; - (double) getSamplingRate; Index: FOOSubstrate.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/include/FOOSubstrate.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOOSubstrate.h 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOOSubstrate.h 1 Aug 2004 23:41:14 -0000 1.2 *************** *** 38,41 **** --- 38,42 ---- #define FOO_FOOSUBSTRATE_H_INCLUDED + #include "FOOGlobal.h" #include "FOOContextPart.h" *************** *** 46,50 **** } ! - (int) size; - (FOOSubstrate *) doInit; --- 47,51 ---- } ! - (long) size; - (FOOSubstrate *) doInit; *************** *** 52,55 **** --- 53,57 ---- */ - (double) getSamplingRate; + - (BOOL) getSamples: (sample_t *)buffer offset: (long)fromFrame size: (long)frames; @end Index: FOORegion.h =================================================================== RCS file: /cvsroot/foo/foo/libfoo/include/FOORegion.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** FOORegion.h 30 Jul 2004 20:10:24 -0000 1.1.1.1 --- FOORegion.h 1 Aug 2004 23:41:14 -0000 1.2 *************** *** 46,57 **** /* Substrate *substrate; // statically typed */ FOOSubstrate *_substrate; ! int _offset; ! int _size; BOOL _reverse; } - (FOORegion *) initWithSubstrate: (FOOSubstrate *)substrate offset: (double)off size: (double)siz rev: (BOOL)rev; ! - (BOOL) getSamples: (sample_t *)buffer offset: (int)off size: (int)size; ! - (int) size; - (double) getSamplingRate; --- 46,62 ---- /* Substrate *substrate; // statically typed */ FOOSubstrate *_substrate; ! long _offset; ! long _size; BOOL _reverse; } - (FOORegion *) initWithSubstrate: (FOOSubstrate *)substrate offset: (double)off size: (double)siz rev: (BOOL)rev; ! ! /* to be removed ! * no in FOOSubstrate.h ! * - (BOOL) getSamples: (sample_t *)buffer offset: (long)off size: (long)size; ! */ ! ! - (long) size; - (double) getSamplingRate; |
|
From: Martin R. <ru...@us...> - 2004-08-01 23:39:29
|
Update of /cvsroot/foo/foo/libfoo/modules/orthodox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23435 Modified Files: FOOMReadBpf.m FOOMReadSnd.m FOOMReadTranspSnd.m FOOMTransposeBpf.m FOOMTransposeSnd.m Log Message: reintroduced changes already made to foo-ng (lost during autoporting) Index: FOOMReadSnd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadSnd.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadSnd.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadSnd.m 1 Aug 2004 23:39:20 -0000 1.2 *************** *** 39,126 **** @implementation FOOMReadSnd - initializeWith: substr { ! if ([substr isKindOf:[FOOSoundFile class]] == NO && ! [substr isKindOf:[FOOSoundStream class]] == NO && ! [substr isKindOf:[FOORegion class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _position = 0; ! return self; } - reset { ! [super reset]; ! _position = 0; ! return self; } - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _end = _begin + [_substrate size]; ! return self; } - (BOOL)activate { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! return _active; } - (BOOL)compute { ! sample_t *p; ! int b, e, s; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(p, b * sizeof(sample_t)); ! } ! else ! { ! b = 0; ! } ! if (_end < BLOCKEND) ! { ! e = BLOCKSIZE - (BLOCKEND - _end); ! bzero(p + e, (BLOCKSIZE - e) * sizeof(sample_t)); ! } ! else ! { ! e = BLOCKSIZE; ! } ! s = e - b; ! if ([_substrate getSamples:p + b offset:_position size:s] == NO) ! { ! FOO_ERROR(NO, _active); ! } ! _position += s; ! COMPUTE_EPILOGUE; } - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! *e = _beginT + SAM_TO_SEC([_substrate size]); ! return (TI_BEG_END); } /* * archiving methods --- 39,137 ---- @implementation FOOMReadSnd + - initializeWith: substr { ! if ([substr isKindOfClass: [FOOSoundFile class]] == NO && ! [substr isKindOfClass: [FOOSoundStream class]] == NO && ! [substr isKindOfClass: [FOORegion class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _position = 0; ! ! return self; } + - reset { ! [super reset]; ! _position = 0; ! ! return self; } + - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _end = _begin + [_substrate size]; ! ! return self; } + - (BOOL)activate { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! return _active; } + - (BOOL)compute { ! sample_t *p; ! int b, e, s; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(p, b * sizeof(sample_t)); ! } ! else ! { ! b = 0; ! } ! if (_end < BLOCKEND) ! { ! e = BLOCKSIZE - (BLOCKEND - _end); ! bzero(p + e, (BLOCKSIZE - e) * sizeof(sample_t)); ! } ! else ! { ! e = BLOCKSIZE; ! } ! s = e - b; ! if ([_substrate getSamples:p + b offset:_position size:s] == NO) ! { ! FOO_ERROR(NO, _active); ! } ! _position += s; ! COMPUTE_EPILOGUE; } + - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! *e = _beginT + SAM_TO_SEC([_substrate size]); ! ! return (TI_BEG_END); } + /* * archiving methods *************** *** 131,144 **** - read:(TypedStream *)stream { ! [super read:stream]; ! objc_read_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } - write:(TypedStream *)stream { ! [super write:stream]; ! objc_write_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } --- 142,155 ---- - read:(TypedStream *)stream { ! [super read:stream]; ! objc_read_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } - write:(TypedStream *)stream { ! [super write:stream]; ! objc_write_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } Index: FOOMTransposeSnd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMTransposeSnd.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMTransposeSnd.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMTransposeSnd.m 1 Aug 2004 23:39:20 -0000 1.2 *************** *** 43,51 **** @implementation FOOMTransposeSnd - initializeWith: substr taps: (int) n { ! if ([substr isKindOf: [FOOSoundFile class]] == NO && ! [substr isKindOf: [FOOSoundStream class]] == NO && ! [substr isKindOf: [FOORegion class]] == NO) { FOO_ERROR(YES, self); --- 43,52 ---- @implementation FOOMTransposeSnd + - initializeWith: substr taps: (int) n { ! if ([substr isKindOfClass: [FOOSoundFile class]] == NO && ! [substr isKindOfClass: [FOOSoundStream class]] == NO && ! [substr isKindOfClass: [FOORegion class]] == NO) { FOO_ERROR(YES, self); *************** *** 65,248 **** _table = [FOOGlobalsManager getSineXoverXTable:_taps]; [self initPos]; return self; } - initPos { ! _position = 0; ! _offset = -_count; ! _end = _offset + _count; ! return self; } - (void) dealloc { ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! [super dealloc]; } - reset { ! [super reset]; ! bzero(_samples, _count * sizeof(sample_t)); ! [self initPos]; ! return self; } - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _factor = [_substrate getSamplingRate] / SAMPLERATE; ! return self; } ! - (BOOL)activate { ! if (INPUTS == 0 || _begin >= BLOCKEND || _position - _taps > [_substrate size]) ! { ! return (_active = NO); ! } ! _active = [INPUT(0) activate]; ! return _active; } ! - (BOOL)compute { ! id m; ! int b, n, tinc, tot; ! double p; ! sample_t *in, *out, *base, *delta; ! int maxtot = _count / 2; ! COMPUTE_PROLOGUE; ! m = [_inputs objectAt:0]; ! // m = [_inputs objectAtIndex:0]; ! [m compute]; ! n = BLOCKSIZE; ! in = [[m getBuffer] data]; ! out = [_buffer data]; ! tot = _taps / 2; ! if (tot > maxtot) ! { ! FOO_ERROR(NO, YES); ! tot = maxtot; ! } ! tinc = [_table getSize] / tot; ! base = [_table getBase]; ! delta = [_table getDelta]; ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(out, b * sizeof(sample_t)); ! in += b; ! out += b; ! n -= b; ! } ! while (n--) ! { ! p = *in++ * _factor; ! if (p < 0) ! { ! p = -p; ! } ! if (p > 1) ! { /* down sampling */ ! sample_t *s; ! double lp = p / ROLL_OFF_FREQU; ! double P = (_position - ((int)_position)) / lp; ! double ptinc = tinc / lp; ! double fti, sum = 0; ! int ti, si, ptot = tot * lp; ! if (ptot > maxtot) ! { ! FOO_ERROR(NO, YES); ! ptot = maxtot; ! } ! if (_end <= _position + ptot) ! { ! _offset = _position - ptot + 1; ! _end = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (fti = P * tinc, si = 0; si < ptot; si++, fti += ptinc) ! { ! ti = (int)fti; ! sum += s[-si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! P = 1. / lp - P; ! for (fti = P * tinc, si = 1; si < ptot; si++, fti += ptinc) ! { ! ti = (int)fti; ! sum += s[si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! *out++ = sum / lp; ! } ! else ! { /* over sampling */ ! sample_t *s; ! double P = _position - ((int)_position); ! double fti = P * tinc; ! int ti1 = (int) fti, ti2 = tinc - ti1 - 1, si; ! double tdelta = fti - ti1, sum = 0; ! if (_end < _position + tot) ! { ! _offset =_position - tot + 1; ! _end = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (si = 0; si > -tot; si--, ti1 += tinc) ! { ! sum += s[si] * (base[ti1] + delta[ti1] * tdelta); ! } ! tdelta = 1 - tdelta; ! for (si = 1; si < tot; si++, ti2 += tinc) ! { ! sum += s[si] * (base[ti2] + delta[ti2] * tdelta); ! } ! *out++ = sum; ! } ! _position += p; } ! COMPUTE_EPILOGUE; } - (int)getTimeInterval: (double*)b : (double*)e { ! *b = _beginT; ! return (TI_BEG); } /* * archiving methods --- 66,262 ---- _table = [FOOGlobalsManager getSineXoverXTable:_taps]; [self initPos]; + return self; } + - initPos { ! _position = 0; ! _offset = -_count; ! _end = _offset + _count; ! ! return self; } + - (void) dealloc { ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! [super dealloc]; } + - reset { ! [super reset]; ! bzero(_samples, _count * sizeof(sample_t)); ! [self initPos]; ! ! return self; } + - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _factor = [_substrate getSamplingRate] / SAMPLERATE; ! ! return self; } ! ! - (BOOL) activate { ! if (INPUTS == 0 || _begin >= BLOCKEND || _position - _taps > [_substrate size]) ! { ! return (_active = NO); ! } ! _active = [INPUT(0) activate]; ! ! return _active; } ! ! - (BOOL) compute { ! id m; ! int b, n, tinc, tot; ! double p; ! sample_t *in, *out, *base, *delta; ! int maxtot = _count / 2; ! COMPUTE_PROLOGUE; ! m = [_inputs objectAtIndex: 0]; ! [m compute]; ! n = BLOCKSIZE; ! in = [[m getBuffer] data]; ! out = [_buffer data]; ! tot = _taps / 2; ! if (tot > maxtot) ! { ! FOO_ERROR(NO, YES); ! tot = maxtot; ! } ! tinc = [_table getSize] / tot; ! base = [_table getBase]; ! delta = [_table getDelta]; ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(out, b * sizeof(sample_t)); ! in += b; ! out += b; ! n -= b; ! } ! while (n--) ! { ! p = *in++ * _factor; ! if (p < 0) ! { ! p = -p; ! } ! if (p > 1) ! { /* down sampling */ ! sample_t *s; ! double lp = p / ROLL_OFF_FREQU; ! double P = (_position - ((int)_position)) / lp; ! double ptinc = tinc / lp; ! double fti, sum = 0; ! int ti, si, ptot = tot * lp; ! if (ptot > maxtot) ! { ! FOO_ERROR(NO, YES); ! ptot = maxtot; ! } ! if (_end <= _position + ptot) ! { ! _offset = _position - ptot + 1; ! _end = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (fti = P * tinc, si = 0; si < ptot; si++, fti += ptinc) ! { ! ti = (int)fti; ! sum += s[-si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! P = 1. / lp - P; ! for (fti = P * tinc, si = 1; si < ptot; si++, fti += ptinc) ! { ! ti = (int)fti; ! sum += s[si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! *out++ = sum / lp; ! } ! else ! { /* over sampling */ ! sample_t *s; ! double P = _position - ((int)_position); ! double fti = P * tinc; ! int ti1 = (int) fti, ti2 = tinc - ti1 - 1, si; ! double tdelta = fti - ti1, sum = 0; ! if (_end < _position + tot) ! { ! _offset =_position - tot + 1; ! _end = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (si = 0; si > -tot; si--, ti1 += tinc) ! { ! sum += s[si] * (base[ti1] + delta[ti1] * tdelta); ! } ! tdelta = 1 - tdelta; ! for (si = 1; si < tot; si++, ti2 += tinc) ! { ! sum += s[si] * (base[ti2] + delta[ti2] * tdelta); ! } ! *out++ = sum; ! } ! _position += p; } ! COMPUTE_EPILOGUE; } + - (int)getTimeInterval: (double*)b : (double*)e { ! *b = _beginT; ! ! return (TI_BEG); } + /* * archiving methods Index: FOOMTransposeBpf.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMTransposeBpf.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMTransposeBpf.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMTransposeBpf.m 1 Aug 2004 23:39:20 -0000 1.2 *************** *** 39,210 **** #define FIRST_TIME -1 @implementation FOOMTransposeBpf - initializeWith: substr { ! if ([substr isKindOf:[FOOBreakpointFunction class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! [self doInit]; ! return self; } - doInit { ! lineseg_t *sp; ! _segments = [_substrate segments]; ! _current = _segments; ! _end = NO; ! _halted = NO; ! for (sp = _current; sp->count != 0; sp++) ! { ! _last = sp; ! } ! _phase = 0; ! _previous = 0; ! return self; } - reset { ! [super reset]; ! [self doInit]; ! return self; } - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT + [_substrate beginT]); ! return self; } - (BOOL)activate { ! if (_begin >= BLOCKEND || _end == YES) ! { ! _active = NO; ! } ! else ! { ! _halted = ([INPUT(0) activate] == NO); ! _active = YES; } ! return _active; } - (BOOL)compute { ! sample_t *out, *in, prev; ! double v, d, p, dod, ai, a; ! int n, c; ! id m; ! COMPUTE_PROLOGUE; ! n = BLOCKSIZE; ! out = DATA_OF_BUF(_buffer); ! prev = _previous; ! if (_halted == YES) ! { ! while (n--) ! { ! *out++ = prev; ! } ! } ! else ! { ! m = INPUT(0); ! [m compute]; ! in = DATA_OF_MOD(m); ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! a = _current->alpha; ! p = _phase; ! if (a != 0) ! { ! dod = d / (1 - transexp(a)); ! ai = a / (c - 1); ! } ! while (n--) ! { ! p += *in++; ! if (p < 0) ! { ! if (_current == _segments) ! { ! *out++ = prev; ! continue; ! } ! else ! { ! _current--; ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! p += c; ! a = _current->alpha; ! if (a != 0) ! { ! dod = d / (1 - transexp(a)); ! ai = a / (c - 1); ! } ! } ! } ! else if (p >= c) ! { ! if (_current == _last) ! { ! *out++ = prev; // should be zero? ! _end = YES; ! continue; ! } ! else ! { ! _current++; ! p -= c; ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! a = _current->alpha; ! if (a != 0) ! { ! ai = a / (c - 1); ! } ! } ! } ! if (a != 0) ! { ! prev = v + d * (1 - transexp(p * ai)); ! } ! else ! { ! prev = v + d * p; ! } ! *out++ = prev; ! } ! _previous = prev; ! _phase = p; ! } ! COMPUTE_EPILOGUE; } - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! return (TI_BEG); } /* * archiving methods --- 39,222 ---- #define FIRST_TIME -1 + @implementation FOOMTransposeBpf + - initializeWith: substr { ! if ([substr isKindOfClass: [FOOBreakpointFunction class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! [self doInit]; ! return self; } + - doInit { ! lineseg_t *sp; ! _segments = [_substrate segments]; ! _current = _segments; ! _end = NO; ! _halted = NO; ! for (sp = _current; sp->count != 0; sp++) ! { ! _last = sp; ! } ! _phase = 0; ! _previous = 0; ! return self; } + - reset { ! [super reset]; ! [self doInit]; ! ! return self; } + - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT + [_substrate beginT]); ! ! return self; } + - (BOOL)activate { ! if (_begin >= BLOCKEND || _end == YES) ! { ! _active = NO; ! } ! else ! { ! _halted = ([INPUT(0) activate] == NO); ! _active = YES; } ! return _active; } + - (BOOL)compute { ! sample_t *out, *in, prev; ! double v, d, p, dod, ai, a; ! int n, c; ! id m; ! COMPUTE_PROLOGUE; ! n = BLOCKSIZE; ! out = DATA_OF_BUF(_buffer); ! prev = _previous; ! if (_halted == YES) ! { ! while (n--) ! { ! *out++ = prev; ! } ! } ! else ! { ! m = INPUT(0); ! [m compute]; ! in = DATA_OF_MOD(m); ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! a = _current->alpha; ! p = _phase; ! if (a != 0) ! { ! dod = d / (1 - transexp(a)); ! ai = a / (c - 1); ! } ! while (n--) ! { ! p += *in++; ! if (p < 0) ! { ! if (_current == _segments) ! { ! *out++ = prev; ! continue; ! } ! else ! { ! _current--; ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! p += c; ! a = _current->alpha; ! if (a != 0) ! { ! dod = d / (1 - transexp(a)); ! ai = a / (c - 1); ! } ! } ! } ! else if (p >= c) ! { ! if (_current == _last) ! { ! *out++ = prev; // should be zero? ! _end = YES; ! continue; ! } ! else ! { ! _current++; ! p -= c; ! c = _current->count; ! v = _current->value; ! d = _current->delta; ! a = _current->alpha; ! if (a != 0) ! { ! ai = a / (c - 1); ! } ! } ! } ! if (a != 0) ! { ! prev = v + d * (1 - transexp(p * ai)); ! } ! else ! { ! prev = v + d * p; ! } ! *out++ = prev; ! } ! _previous = prev; ! _phase = p; ! } ! COMPUTE_EPILOGUE; } + - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! ! return (TI_BEG); } + /* * archiving methods Index: FOOMReadTranspSnd.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadTranspSnd.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadTranspSnd.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadTranspSnd.m 1 Aug 2004 23:39:20 -0000 1.2 *************** *** 45,316 **** #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size @implementation FOOMReadTranspSnd - init { ! [super init]; ! _samples = NULL; ! return self; } - initializeWith: substr { ! if ([substr isKindOf:[FOOSoundFile class]] == NO && ! [substr isKindOf:[FOOSoundStream class]] == NO && ! [substr isKindOf:[FOORegion class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _taps = 0; ! [self initPos]; ! return self; } - initializeTaps: (int)n { ! _taps = n; ! _count = SAMPLE_BUFFER_SIZE; ! if (_taps < 4 || _taps >= _count) ! { ! FOO_ERROR(YES, self); ! } ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! _samples = NSZoneCalloc([self zone], _count, sizeof(sample_t)); ! _table = [FOOGlobalsManager getSineXoverXTable:_taps]; ! [self initPos]; ! return self; } - initializeWith:substr taps: (int)n { ! [self initializeWith:substr]; ! [self initializeTaps:n]; ! return self; } ! - (void) deallooc { ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! return [super dealloc]; } - initPos { ! _position = 0; ! if (_taps != 0) { ! _offset = -_count; ! _endCache = _offset + _count; ! } ! return self; } - reset { ! [super reset]; ! [self initPos]; ! return self; } - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _end = _begin + [_substrate size]; ! if ([_substrate getSamplingRate] != SAMPLERATE) ! { ! _factor = [_substrate getSamplingRate] / SAMPLERATE; ! [self initializeTaps:[FOOGlobalsManager getDefaultTaps]]; ! } ! else ! { ! _factor = 1; ! } ! return self; } ! - (BOOL)activate { ! if (_taps == 0) ! { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! _active = NO; ! else ! _active = YES; ! } ! else ! { ! if (_begin >= BLOCKEND || _position - _taps >= [_substrate size]) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! } ! return _active; } - (BOOL)compute { ! if (_taps == 0) ! { ! return [self computeRead]; ! } ! else ! { ! return [self computeTransp]; ! } } - (BOOL)computeRead { ! sample_t *p; ! int b, e, s; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(p, b * sizeof(sample_t)); ! } ! else ! { ! b = 0; ! } ! if (_end < BLOCKEND) ! { ! e = BLOCKSIZE - (BLOCKEND - _end); ! bzero(p + e, (BLOCKSIZE - e) * sizeof(sample_t)); ! } ! else ! { ! e = BLOCKSIZE; ! } ! s = e - b; ! if ([_substrate getSamples:p + b offset:_position size:s] == NO) ! { ! FOO_ERROR(NO, _active); ! } ! _position += s; ! COMPUTE_EPILOGUE; } - (BOOL)computeTransp { ! int n, b, tinc, tot; ! double p; ! sample_t *out, *base, *delta; ! int maxtot = _count / 2; ! COMPUTE_PROLOGUE; ! n = BLOCKSIZE; ! out = [_buffer data]; ! tot = _taps / 2; ! if (tot > maxtot) ! { ! FOO_ERROR(NO, YES); ! tot = maxtot; ! } ! tinc = [_table getSize] / tot; ! base = [_table getBase]; ! delta = [_table getDelta]; ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(out, b * sizeof(sample_t)); ! out += b; ! n -= b; ! } ! p = _factor; ! if (p < 0) ! { ! p = -p; ! } ! while (n--) ! { ! if (p > 1) ! { /* down sampling */ ! sample_t *s; ! double lp = p / ROLL_OFF_FREQU; ! double P = (_position - ((int)_position)) / lp; ! double ptinc = tinc / lp; ! double fti, sum = 0; ! int ti, si, ptot = tot * lp; ! if (ptot > maxtot) ! { ! FOO_ERROR(NO, YES); ! ptot = maxtot; ! } ! if (_endCache <= _position + ptot) ! { ! _offset = _position - ptot + 1; ! _endCache = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (fti = P * tinc, si = 0; si < ptot; si++, fti += ptinc) ! { ! ti = (int) fti; ! sum += s[-si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! P = 1. / lp - P; ! for (fti = P * tinc, si = 1; si < ptot; si++, fti += ptinc) ! { ! ti = (int) fti; ! sum += s[si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! *out++ = sum / lp; ! } ! else ! { /* over sampling */ ! sample_t *s; ! double P = _position - ((int)_position); ! double fti = P * tinc; ! int ti1 = (int) fti, ti2 = tinc - ti1 - 1, si; ! double tdelta = fti - ti1, sum = 0; ! if (_endCache < _position + tot) ! { ! _offset = _position - tot + 1; ! _endCache = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (si = 0; si > -tot; si--, ti1 += tinc) ! { ! sum += s[si] * (base[ti1] + delta[ti1] * tdelta); ! } ! tdelta = 1 - tdelta; ! for (si = 1; si < tot; si++, ti2 += tinc) ! { ! sum += s[si] * (base[ti2] + delta[ti2] * tdelta); ! } ! *out++ = sum; ! } ! _position += p; ! } ! COMPUTE_EPILOGUE; } - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! *e = _beginT + [_substrate size] / [_substrate getSamplingRate]; ! return (TI_BEG_END); } /* * archiving methods --- 45,338 ---- #define SAMPLE_BUFFER_SIZE 1024 // should be several times the taps size + @implementation FOOMReadTranspSnd - init { ! [super init]; ! _samples = NULL; ! ! return self; } + - initializeWith: substr { ! if ([substr isKindOfClass: [FOOSoundFile class]] == NO && ! [substr isKindOfClass: [FOOSoundStream class]] == NO && ! [substr isKindOfClass: [FOORegion class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _taps = 0; ! [self initPos]; ! ! return self; } + - initializeTaps: (int)n { ! _taps = n; ! _count = SAMPLE_BUFFER_SIZE; ! if (_taps < 4 || _taps >= _count) ! { ! FOO_ERROR(YES, self); ! } ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! _samples = NSZoneCalloc([self zone], _count, sizeof(sample_t)); ! _table = [FOOGlobalsManager getSineXoverXTable:_taps]; ! [self initPos]; ! ! return self; } + - initializeWith:substr taps: (int)n { ! [self initializeWith:substr]; ! [self initializeTaps:n]; ! ! return self; } ! ! - (void) dealloc { ! if (_samples != NULL) ! { ! NSZoneFree([self zone], _samples); ! } ! ! return [super dealloc]; } + - initPos { ! _position = 0; ! if (_taps != 0) { ! _offset = -_count; ! _endCache = _offset + _count; ! } ! ! return self; } + - reset { ! [super reset]; ! [self initPos]; ! ! return self; } + - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT); ! _end = _begin + [_substrate size]; ! if ([_substrate getSamplingRate] != SAMPLERATE) ! { ! _factor = [_substrate getSamplingRate] / SAMPLERATE; ! [self initializeTaps:[FOOGlobalsManager getDefaultTaps]]; ! } ! else ! { ! _factor = 1; ! } ! ! return self; } ! ! - (BOOL) activate { ! if (_taps == 0) ! { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! _active = NO; ! else ! _active = YES; ! } ! else ! { ! if (_begin >= BLOCKEND || _position - _taps >= [_substrate size]) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! } ! return _active; } + - (BOOL)compute { ! if (_taps == 0) ! { ! return [self computeRead]; ! } ! else ! { ! return [self computeTransp]; ! } } + - (BOOL)computeRead { ! sample_t *p; ! int b, e, s; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(p, b * sizeof(sample_t)); ! } ! else ! { ! b = 0; ! } ! if (_end < BLOCKEND) ! { ! e = BLOCKSIZE - (BLOCKEND - _end); ! bzero(p + e, (BLOCKSIZE - e) * sizeof(sample_t)); ! } ! else ! { ! e = BLOCKSIZE; ! } ! s = e - b; ! if ([_substrate getSamples: p + b offset: _position size: s] == NO) ! { ! FOO_ERROR(NO, _active); ! } ! _position += s; ! COMPUTE_EPILOGUE; } + - (BOOL)computeTransp { ! int n, b, tinc, tot; ! double p; ! sample_t *out, *base, *delta; ! int maxtot = _count / 2; ! COMPUTE_PROLOGUE; ! n = BLOCKSIZE; ! out = [_buffer data]; ! tot = _taps / 2; ! if (tot > maxtot) ! { ! FOO_ERROR(NO, YES); ! tot = maxtot; ! } ! tinc = [_table getSize] / tot; ! base = [_table getBase]; ! delta = [_table getDelta]; ! if (_begin > SAMPLETIME) ! { ! b = _begin - SAMPLETIME; ! bzero(out, b * sizeof(sample_t)); ! out += b; ! n -= b; ! } ! p = _factor; ! if (p < 0) ! { ! p = -p; ! } ! while (n--) ! { ! if (p > 1) ! { /* down sampling */ ! sample_t *s; ! double lp = p / ROLL_OFF_FREQU; ! double P = (_position - ((int)_position)) / lp; ! double ptinc = tinc / lp; ! double fti, sum = 0; ! int ti, si, ptot = tot * lp; ! if (ptot > maxtot) ! { ! FOO_ERROR(NO, YES); ! ptot = maxtot; ! } ! if (_endCache <= _position + ptot) ! { ! _offset = _position - ptot + 1; ! _endCache = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (fti = P * tinc, si = 0; si < ptot; si++, fti += ptinc) ! { ! ti = (int) fti; ! sum += s[-si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! P = 1. / lp - P; ! for (fti = P * tinc, si = 1; si < ptot; si++, fti += ptinc) ! { ! ti = (int) fti; ! sum += s[si] * (base[ti] + delta[ti] * (fti - ti)); ! } ! *out++ = sum / lp; ! } ! else ! { /* over sampling */ ! sample_t *s; ! double P = _position - ((int)_position); ! double fti = P * tinc; ! int ti1 = (int) fti, ti2 = tinc - ti1 - 1, si; ! double tdelta = fti - ti1, sum = 0; ! if (_endCache < _position + tot) ! { ! _offset = _position - tot + 1; ! _endCache = _offset + _count; ! [_substrate getSamples:_samples offset:_offset size:_count]; ! } ! s = _samples + ((int)_position - _offset); ! for (si = 0; si > -tot; si--, ti1 += tinc) ! { ! sum += s[si] * (base[ti1] + delta[ti1] * tdelta); ! } ! tdelta = 1 - tdelta; ! for (si = 1; si < tot; si++, ti2 += tinc) ! { ! sum += s[si] * (base[ti2] + delta[ti2] * tdelta); ! } ! *out++ = sum; ! } ! _position += p; ! } ! COMPUTE_EPILOGUE; } + - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT; ! *e = _beginT + [_substrate size] / [_substrate getSamplingRate]; ! return (TI_BEG_END); } + /* * archiving methods Index: FOOMReadBpf.m =================================================================== RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMReadBpf.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FOOMReadBpf.m 31 Jul 2004 03:05:30 -0000 1.1 --- FOOMReadBpf.m 1 Aug 2004 23:39:20 -0000 1.2 *************** *** 42,195 **** @implementation FOOMReadBpf - initializeWith: substr { ! lineseg_t *sp; ! if ([substr isKindOf:[FOOBreakpointFunction class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _lasttime = FIRST_TIME; ! _current = [_substrate segments]; ! for (sp = _current; sp->count != 0; sp++) ! { ! ; ! } ! _last = sp; ! return self; } - reset { ! lineseg_t *sp; ! [super reset]; ! _current = [_substrate segments]; ! for (sp = _current; sp->count != 0; sp++) ! { ! ; ! } ! _last = sp; ! return self; } - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT + [_substrate beginT]); ! _end = _begin + SEC_TO_SAM([_substrate sizeT]); ! return self; } - (BOOL)activate { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! return _active; } - (BOOL)compute { ! sample_t *p, value, delta; ! double alpha; ! int count = 0, debut, fin, restSeg, restBlk, curr_count; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_lasttime == FIRST_TIME) { ! for (count = 0; count < _begin - SAMPLETIME; count++) ! { ! *p++ = 0; ! } ! _offset = 0; ! _lasttime = SAMPLETIME; } ! while (count < BLOCKSIZE) { ! if (_current == _last) ! { ! while (count++ < BLOCKSIZE) ! { ! *p++ = 0; ! } ! } ! else ! { ! debut = _offset; ! value = _current->value; ! delta = _current->delta; ! alpha = _current->alpha; ! curr_count = _current->count; ! restSeg = curr_count - _offset; ! restBlk = BLOCKSIZE - count; ! if (_offset == 0) ! { ! if (alpha == 0) ! { ! _phase = 0; ! } ! else ! { ! _factor = pow(exp(alpha), 1. / (curr_count - 1)); ! _phase = 1. / _factor; ! } ! } ! if (restBlk < restSeg) ! { ! fin = _offset + restBlk; ! count += restBlk; ! _offset += restBlk; ! } ! else ! { ! fin = _offset + restSeg; ! count += restSeg; ! _offset = 0; ! _current++; ! } ! if (alpha == 0) ! { ! double ph = _phase; ! int n = fin - debut; ! while (n--) ! { ! ph += delta; ! *p++ = value + ph; ! } ! _phase = ph; ! } ! else ! { ! double ph = _phase; ! int n = fin - debut; ! while (n--) ! { ! ph *= _factor; ! *p++ = value + delta * (1 - ph); ! } ! _phase = ph; ! } ! } } ! _lasttime = SAMPLETIME + BLOCKSIZE; ! COMPUTE_EPILOGUE; } - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT + [_substrate beginT]; ! *e = *b + [_substrate sizeT]; ! return (TI_BEG_END); } /* * archiving methods --- 42,206 ---- @implementation FOOMReadBpf + - initializeWith: substr { ! lineseg_t *sp; ! if ([substr isKindOfClass: [FOOBreakpointFunction class]] == NO) ! { ! FOO_ERROR(YES, self); ! } ! _substrate = substr; ! _beginT = TIMEFRAME; ! _lasttime = FIRST_TIME; ! _current = [_substrate segments]; ! for (sp = _current; sp->count != 0; sp++) ! { ! ; ! } ! _last = sp; ! ! return self; } + - reset { ! lineseg_t *sp; ! [super reset]; ! _current = [_substrate segments]; ! for (sp = _current; sp->count != 0; sp++) ! { ! ; ! } ! _last = sp; ! ! return self; } + - startUp { ! [super startUp]; ! _begin = SEC_TO_SAM(_beginT + [_substrate beginT]); ! _end = _begin + SEC_TO_SAM([_substrate sizeT]); ! ! return self; } + - (BOOL)activate { ! if (_begin >= BLOCKEND || _end < SAMPLETIME) ! { ! _active = NO; ! } ! else ! { ! _active = YES; ! } ! ! return _active; } + - (BOOL)compute { ! sample_t *p, value, delta; ! double alpha; ! int count = 0, debut, fin, restSeg, restBlk, curr_count; ! COMPUTE_PROLOGUE; ! p = DATA_OF_BUF(_buffer); ! if (_lasttime == FIRST_TIME) ! { ! for (count = 0; count < _begin - SAMPLETIME; count++) ! { ! *p++ = 0; ! } ! _offset = 0; ! _lasttime = SAMPLETIME; ! } ! while (count < BLOCKSIZE) ! { ! if (_current == _last) ! { ! while (count++ < BLOCKSIZE) ! { ! *p++ = 0; ! } ! } ! else ! { ! debut = _offset; ! value = _current->value; ! delta = _current->delta; ! alpha = _current->alpha; ! curr_count = _current->count; ! restSeg = curr_count - _offset; ! restBlk = BLOCKSIZE - count; ! if (_offset == 0) ! { ! if (alpha == 0) { ! _phase = 0; } ! else { ! _factor = pow(exp(alpha), 1. / (curr_count - 1)); ! _phase = 1. / _factor; } ! } ! if (restBlk < restSeg) ! { ! fin = _offset + restBlk; ! count += restBlk; ! _offset += restBlk; ! } ! else ! { ! fin = _offset + restSeg; ! count += restSeg; ! _offset = 0; ! _current++; ! } ! if (alpha == 0) ! { ! double ph = _phase; ! int n = fin - debut; ! while (n--) ! { ! ph += delta; ! *p++ = value + ph; ! } ! _phase = ph; ! } ! else ! { ! double ph = _phase; ! int n = fin - debut; ! while (n--) ! { ! ph *= _factor; ! *p++ = value + delta * (1 - ph); ! } ! _phase = ph; ! } ! } ! } ! _lasttime = SAMPLETIME + BLOCKSIZE; ! COMPUTE_EPILOGUE; } + - (int)getTimeInterval:(double*)b :(double*)e { ! *b = _beginT + [_substrate beginT]; ! *e = *b + [_substrate sizeT]; ! return (TI_BEG_END); } + /* * archiving methods *************** *** 200,213 **** - read:(TypedStream *)stream { ! [super read:stream]; ! objc_read_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } - write:(TypedStream *)stream { ! [super write:stream]; ! objc_write_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } --- 211,224 ---- - read:(TypedStream *)stream { ! [super read:stream]; ! objc_read_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } - write:(TypedStream *)stream { ! [super write:stream]; ! objc_write_types(stream, "@[8c]", &_substrate, &_beginT); ! return self; } |
