foo-cvs — mailing list for CVS commit messages.

[foo-cvs] foo/libfoo/modules/banff FOOMAllpass.h,NONE,1.1 FOOMAllpass.m,NONE,1.1 FOOMComb.h,NONE,1.1 FOOMComb.m,NONE,1.1 Makefile.am,NONE,1.1

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/modules/banff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27918

Added Files:
	FOOMAllpass.h FOOMAllpass.m FOOMComb.h FOOMComb.m Makefile.am 
Log Message:
added experimental modules

--- NEW FILE: FOOMAllpass.h ---
/* -*-Mode:objc-*- */

/*
 * FOOMAllpass.h
 *
 * allpass 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: FOOMAllpass.h,v 1.1 2004/08/26 09:50:22 rumori Exp $ */

#ifndef FOOM_FOOMALLPASS_H_INCLUDED
#define FOOM_FOOMALLPASS_H_INCLUDED

#include <FOO/FOOModule.h>

@interface FOOMAllpass : FOOModule <NSCoding>
{
  int _order;
  sample_t *_states;
}

- (id) initWithOrder: (int)order;

@end

#endif /* #ifndef FOOM_FOOMALLPASS_H_INCLUDED */

--- NEW FILE: Makefile.am ---
# foo/libfoo/modules/banff/Makefile.am
# 2004 rumori

# $Id: Makefile.am,v 1.1 2004/08/26 09:50:22 rumori Exp $

noinst_LTLIBRARIES = libfoombanff.la

NULL = 

libfoombanff_la_SOURCES = \
	FOOMAllpass.h \
	FOOMAllpass.m \
	FOOMComb.h \
	FOOMComb.m \
	$(NULL)

if USE_GNUSTEP_BASE
include @GNUSTEP_MAKEFILES@/library-combo.make
include @GNUSTEP_MAKEFILES@/common.make
include @GNUSTEP_MAKEFILES@/Additional/base.make
endif

FOO_CFLAGS = @FOO_CFLAGS@
FOO_OBJCFLAGS = @FOO_OBJCFLAGS@ @FOO_GNUSTEP_OBJCFLAGS@
FOO_LDFLAGS = @FOO_LDFLAGS@ @FOO_GNUSTEP_LDFLAGS@
FOO_LIBS = @FOO_LIBS@

libfoombanff_la_CFLAGS =	$(FOO_CFLAGS)
libfoombanff_la_OBJCFLAGS =	$(FOO_OBJCFLAGS) \
				$(FND_DEFINE)
libfoombanff_la_LIBADD =	-lm

--- NEW FILE: FOOMComb.m ---
/* -*-Mode:objc-*- */

/*
 * FOOMComb.m
 *
 * feedback delay line
 *
 */

/*
 * 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: FOOMComb.m,v 1.1 2004/08/26 09:50:22 rumori Exp $ */

#include "FOOMComb.h"


@implementation FOOMComb


- (id) initWithTaps: (int)taps maxDelay: (double)maxDelay
{
  _taps = taps;
  _table = [FOOGlobalsManager getSineXoverXTable: _taps];
  _line = NULL;
  _maxDelayT = maxDelay;

  return self;
}


- (void) dealloc
{
  NSZoneFree([self zone], _line);
  _line = NULL;

  [super dealloc];
}


- reset
{
  [super reset];

  if (_line)
    {
      NSZoneFree([self zone], _line);
      _line = NULL;
    }
  _ptr = 0;

  return self;
}


- startUp
{
  [super startUp];

  _maxDelay = SEC_TO_SAM(_maxDelayT);
  _line = NSZoneCalloc([self zone], _maxDelay, sizeof(sample_t));
  _ptr = 0;

  return self;
}


- (BOOL) activate
{
//   if (INPUTS < 2 || [INPUT(0) activate] == NO || [INPUT(1) activate] == NO)
//     {
//       _active = NO;
//     }
//   else
//     {
//       _active = YES;
//     }

  // take feedback in account
  [INPUT(0) activate];
  [INPUT(1) activate];
  [INPUT(2) activate];
  [INPUT(3) activate];

  return (_active = YES);
}


- (BOOL) compute
{
  FOOModule *m0, *m1, *m2, *m3;
  sample_t *input, *delay, *feedback, *wetdry, *output;
  int i, n, dpos, ipos;
  double tap, sr, fpos, fti, tdelta;
  int tot, tinc, ti1, ti2; // total of taps, tap increment
  sample_t *base, *delta; // lookup table, delta table

  COMPUTE_PROLOGUE;
  m0 = INPUT(0);
  m1 = INPUT(1);
  m2 = INPUT(2);
  m3 = INPUT(3);
  [m0 compute];
  [m1 compute];
  [m2 compute];
  [m3 compute];
  input = DATA_OF_MOD(m0);
  delay = DATA_OF_MOD(m1);
  feedback = DATA_OF_MOD(m2);
  wetdry = DATA_OF_MOD(m3);
  output = DATA_OF_BUF(_buffer);
  n  = BLOCKSIZE;
  sr = SAMPLERATE;

  tot = _taps / 2;
  tinc = [_table getSize] / tot;
  base = [_table getBase];
  delta = [_table getDelta];

  while (n--)
    {
      // interpolate
      tap = 0;
      fpos = *delay++ * sr;
      ipos = (int)fpos;

      // shorter delay than samples for interpolation?
      if (ipos < tot)
	{
	  FOO_ERROR(NO, YES);
	  ipos = tot;
	}

      fti = (fpos - ipos) * tinc;
      ti1 = (int)fti;
      ti2 = tinc - ti1 - 1;
      tdelta = fti - ti1;

      dpos = _ptr + ipos;
      while (dpos > _maxDelay - 1)
	{ // wrap around
	  dpos -= _maxDelay;
	}

      for (i = tot; i > 0; --i, ti1 += tinc)
	{
	  tap += _line[dpos--] * (base[ti1] + delta[ti1] * tdelta);

	  if (dpos < 0)
	    {
	      dpos = _maxDelay - 1;
	    }
	}

      tdelta = 1 - tdelta;
      dpos = _ptr + ipos + 1;

      while (dpos > _maxDelay - 1)
	{ // wrap around
	  dpos -= _maxDelay;
	}
						
      for (i = tot; i > 0; --i, ti2 += tinc)
	{
	  tap += _line[dpos++] * (base[ti2] + delta[ti2] * tdelta);

	  if (dpos > _maxDelay - 1)
	    {
	      dpos = 0;
	    }
	}

      // copy + feedback to delay line
      _line[_ptr] = tap * *feedback++ + *input;
      --_ptr;

      if (_ptr < 0)
	{ // wrap around
	  _ptr = _maxDelay - 1;
	}

      // output
      *output++ = *wetdry * tap + (1 - *wetdry) * *input++;
      ++wetdry;
    }
  COMPUTE_EPILOGUE;
}


/*
 * archiving methods
 */

- (void) encodeWithCoder: (NSCoder *)coder
{
  [super encodeWithCoder: coder];

  return;
}


- (id) initWithCoder: (NSCoder *)coder
{
  self = [super initWithCoder: coder];

  return self;
}

@end

--- NEW FILE: FOOMComb.h ---
/* -*-Mode:objc-*- */

/*
 * FOOMComb.h
 *
 * feedback delay line
 *
 */

/*
 * 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: FOOMComb.h,v 1.1 2004/08/26 09:50:22 rumori Exp $ */

#ifndef FOOM_FOOMCOMB_H_INCLUDED
#define FOOM_FOOMCOMB_H_INCLUDED

#include <FOO/FOOModule.h>
#include <FOO/FOOLookupTable.h>


@interface FOOMComb : FOOModule <NSCoding>
{
  int _maxDelay;	// maximum delay in samples = size of delay line
  double _maxDelayT;	// maximum delay in seconds
  sample_t *_line;	// delay line
  int _ptr;		// write index in delay line
  int _taps;		// num of taps for resampling
  FOOLookupTable *_table; // sinc table for resampling
}

- (id) initWithTaps: (int)taps maxDelay: (double)maxDelay;

@end

#endif /* #ifndef FOOM_FOOMALLPASS_H_INCLUDED */

--- NEW FILE: FOOMAllpass.m ---
/* -*-Mode:objc-*- */

/*
 * FOOMAllpass.m
 *
 * module allpass
 *
 */

/*
 * 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: FOOMAllpass.m,v 1.1 2004/08/26 09:50:22 rumori Exp $ */

#include "FOOMAllpass.h"


@implementation FOOMAllpass


- (id) initWithOrder: (int)order
{
  _order = order;
  _states = NSZoneCalloc([self zone], order + 1, sizeof(sample_t));

  return self;
}


- (void) dealloc
{
  NSZoneFree([self zone], _states);

  [super dealloc];
}


- (BOOL) activate
{
//   if (INPUTS < 2 || [INPUT(0) activate] == NO || [INPUT(1) activate] == NO)
//     {
//       _active = NO;
//     }
//   else
//     {
//       _active = YES;
//     }

  // take feedback in account
  [INPUT(0) activate];
  [INPUT(1) activate];
  _active = YES;

  return _active;
}


- (BOOL) compute
{
  FOOModule *m, *r;
  int j, n;
  sample_t last, tmp, *out, *in, *rho;
    
  COMPUTE_PROLOGUE;
  m = INPUT(0);
  r = INPUT(1);
  [m compute];
  [r compute];
  in = DATA_OF_MOD(m);
  rho = DATA_OF_MOD(r);
  out = DATA_OF_BUF(_buffer);
  n  = BLOCKSIZE;

  while (n--)
    {
      // first in chain
      tmp = _states[0];
      _states[0] = *in++;

      for (j = 1; j <= _order; ++j)
  	{
  	  last = tmp;
 	  tmp = _states[j];
  	  _states[j] = *rho * (_states[j] - _states[j - 1]) + last;
  	}

      // last in chain
      *out++ = _states[_order];
      rho++;
    }
  COMPUTE_EPILOGUE;
}


- (int) incrementBuffer
{
    return 0;
}


/*
 * archiving methods
 */

- (void) encodeWithCoder: (NSCoder *)coder
{
  [super encodeWithCoder: coder];

  if ([coder allowsKeyedCoding])
    {
      [coder encodeInt: _order forKey: @"FOOMAllpass:order"];
    }
  else
    {
      [coder encodeValueOfObjCType: @encode(int) at: &_order];
    }

  return;
}


- (id) initWithCoder: (NSCoder *)coder
{
  self = [super initWithCoder: coder];

  if ([coder allowsKeyedCoding])
    {
      _order = [coder decodeIntForKey: @"FOOMAllpass:order"];
    }
  else
    {
      [coder decodeValueOfObjCType: @encode(int) at: &_order];
    }

  _states = NSZoneCalloc([self zone], _order + 1, sizeof(sample_t));

  return self;
}

@end

[foo-cvs] foo/libfoo/modules/banff - New directory

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/modules/banff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27766/banff

Log Message:
Directory /cvsroot/foo/foo/libfoo/modules/banff added to the repository

[foo-cvs] foo/libfoo/modules/orthodox FOOMBandlimitedNoise.m,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/modules/orthodox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27737

Modified Files:
	FOOMBandlimitedNoise.m 
Log Message:
cosmetic changes

Index: FOOMBandlimitedNoise.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOMBandlimitedNoise.m	16 Aug 2004 05:20:49 -0000	1.4
--- FOOMBandlimitedNoise.m	26 Aug 2004 09:49:16 -0000	1.5
***************
*** 73,82 ****
  - (BOOL) activate
  {
!     if (INPUTS == 0 || [INPUT(0) activate] == NO)
!         _active = NO;
!     else
!         _active = YES;
  
!     return _active;
  }
  
--- 73,86 ----
  - (BOOL) activate
  {
!   if (INPUTS == 0 || [INPUT(0) activate] == NO)
!     {
!       _active = NO;
!     }
!   else
!     {
!       _active = YES;
!     }
  
!   return _active;
  }
  

[foo-cvs] foo/libfoo/src FOOBufferManager.m,1.3,1.4 FOOSineXoverXTable.m,1.2,1.3 Makefile.am,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27460

Modified Files:
	FOOBufferManager.m FOOSineXoverXTable.m Makefile.am 
Log Message:
fixed small warning inssue in FOOBufferManager (archiving related).
introduced Kaiser windowing to sinc tables.  disabled so far (seems not yet to work properly)
link against new banff modules

Index: FOOBufferManager.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOBufferManager.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOBufferManager.m	13 Aug 2004 21:38:01 -0000	1.3
--- FOOBufferManager.m	26 Aug 2004 09:47:52 -0000	1.4
***************
*** 118,122 ****
  
  
! - (FOOBufferManager *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 118,122 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
***************
*** 129,134 ****
      {
        [coder decodeValueOfObjCType: @encode(int) at: &_bufferSize];
- 
-       return;
      }
  
--- 129,132 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	31 Jul 2004 08:10:20 -0000	1.4
--- Makefile.am	26 Aug 2004 09:47:52 -0000	1.5
***************
*** 53,55 ****
  libfoo_la_LIBADD =	$(FOO_LIBS) $(FND_LIBS) \
  			-lobjc \
! 			../modules/orthodox/libfoomorthodox.la
--- 53,57 ----
  libfoo_la_LIBADD =	$(FOO_LIBS) $(FND_LIBS) \
  			-lobjc \
! 			../modules/orthodox/libfoomorthodox.la \
! 			../modules/banff/libfoombanff.la \
! 			$(NULL)

Index: FOOSineXoverXTable.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOSineXoverXTable.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOSineXoverXTable.m	4 Aug 2004 06:16:41 -0000	1.2
--- FOOSineXoverXTable.m	26 Aug 2004 09:47:52 -0000	1.3
***************
*** 38,41 ****
--- 38,73 ----
  #include "FOO/FOOSineXoverXTable.h"
  
+ // #define KAISER_WINDOW // hanning window otherwise
+ 
+ #ifdef KAISER_WINDOW
+ 
+ #define KAISER_KOEFF 5.6
+ 
+ static double
+ bessel0 (double x)
+ {
+   const double t = 1.e-08;
+   double y = 0.5 * x, e = 1., de = 1.;
+   int i;
+   double sde;
+ 
+   for (i = 1; i < 26; ++i)
+     {
+       de *= y / x;
+       sde = de * de;
+       e += sde;
+ 
+       if (e * t - sde > 0)
+ 	{
+ 	  break;
+ 	}
+     }
+ 
+   return e;  
+ }
+ 
+ static double _besselconst;
+ #endif
+ 
  
  @implementation FOOSineXoverXTable
***************
*** 44,47 ****
--- 76,83 ----
  				 size: (int)size
  {
+ #ifdef KAISER_WINDOW
+   _besselconst = bessel0(KAISER_KOEFF);
+ #endif
+ 
    if (n & 1 || n < 4)
      {
***************
*** 50,54 ****
    _taps = n;
    [super initWithOrigin: 0.0 extent: n/2.0 size: size];
- 
    return self;
  }
--- 86,89 ----
***************
*** 58,62 ****
  {
    double xMax = _taps / 2 - .5;
!     
    if (x > xMax)
      { 
--- 93,97 ----
  {
    double xMax = _taps / 2 - .5;
! 
    if (x > xMax)
      { 
***************
*** 67,73 ****
        return 1;
      }
-   x *= M_PI;
  
    return ((sin(x) / x) * (cos(x / xMax) / 2. + .5));
  }
  
--- 102,119 ----
        return 1;
      }
  
+ #ifdef KAISER_WINDOW
+ 
+   double y = x * M_PI;
+   y = sin(y) / y;
+   y *= bessel0(KAISER_KOEFF * sqrt(1 - (2 * x * _scaler / ((_size - 1) * 2)) * (2 * x * _scaler / ((_size - 1) * 2)))) / _besselconst;
+   return y;
+ 
+ #else // hanning window
+ 
+   x *= M_PI;
    return ((sin(x) / x) * (cos(x / xMax) / 2. + .5));
+ 
+ #endif
  }
  

[foo-cvs] foo/libfoo/FOO FOOGlobal.h,1.3,1.4

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/FOO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26844

Modified Files:
	FOOGlobal.h 
Log Message:
fixed another autorelease bug in FOO_ERROR

Index: FOOGlobal.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOGlobal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOGlobal.h	13 Aug 2004 21:36:50 -0000	1.3
--- FOOGlobal.h	26 Aug 2004 09:43:50 -0000	1.4
***************
*** 52,56 ****
      _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; }
--- 52,55 ----

[foo-cvs] foo/elkfoo/scm toplevel.foo.in,1.5,1.6

[Gerhard E. <gu...@us...>]

Update of /cvsroot/foo/foo/elkfoo/scm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13910

Modified Files:
	toplevel.foo.in 
Log Message:
moved scripting related portion of code before loading of customization files

Index: toplevel.foo.in
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/toplevel.foo.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** toplevel.foo.in	25 Aug 2004 23:16:33 -0000	1.5
--- toplevel.foo.in	26 Aug 2004 08:20:25 -0000	1.6
***************
*** 197,200 ****
--- 197,215 ----
    (load file (global-environment)))
  
+ ;; scripting
+ (if (not (null? (command-line-args)))
+     (if (file-exists? (car (command-line-args)))
+ 	(begin
+ 	  (set! foo-script-file (car (command-line-args)))
+ 	  (set! load-foo-script-file #t))
+ 	(begin
+ 	  (format #t "couldn't load foo script ~s\n" (car (command-line-args)))
+ 	  (if (bound? 'foo:cleanup)
+ 	      (foo:cleanup))
+ 	  (exit)))
+     ;; load history (ignore errors)
+     (if (and (feature? 'readline.la) (bound? 'readline-read-history))
+ 	(readline-read-history (tilde-expand "~/.foo/foo_history"))))
+ 
  ;; std list of initialization files
  (define foo-init-files
***************
*** 228,246 ****
  (map load foo-init-files)
  
- ;; scripting
- (if (not (null? (command-line-args)))
-     (if (file-exists? (car (command-line-args)))
- 	(begin
- 	  (set! foo-script-file (car (command-line-args)))
- 	  (set! load-foo-script-file #t))
- 	(begin
- 	  (format #t "couldn't load foo script ~s\n" (car (command-line-args)))
- 	  (if (bound? 'foo:cleanup)
- 	      (foo:cleanup))
- 	  (exit)))
-     ;; load history (ignore errors)
-     (if (and (feature? 'readline.la) (bound? 'readline-read-history))
- 	(readline-read-history (tilde-expand "~/.foo/foo_history"))))
- 
  (provide 'foo)
  
--- 243,246 ----

[foo-cvs] foo/elkfoo/scm/kernel elkfoo.scm,1.2,1.3

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/scm/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25637/kernel

Modified Files:
	elkfoo.scm 
Log Message:
added support for (readline-[read | write]-history), backwards compatible to older readline extension

Index: elkfoo.scm
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/kernel/elkfoo.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** elkfoo.scm	14 Aug 2004 15:57:18 -0000	1.2
--- elkfoo.scm	25 Aug 2004 23:16:33 -0000	1.3
***************
*** 131,134 ****
--- 131,137 ----
  (define v2pf~ foo:make-v2pf)
  
+ (define allpass~ foo:make-allpass)
+ (define comb~ foo:make-comb)
+ 
  (define (print~ s . commentary)
    (tell (foo:context-pointer (current-context)) 'invalidatePrint)
***************
*** 258,266 ****
  
  (define (foo:cleanup)
!   (let ((test-file (foo:test-file-name)))
!     (if (file-exists? test-file)
! 	(begin
! 					;(format #t "removing ~a~%" test-file)
! 	  (system (string-append "rm " test-file))))))
  
  (define (quit)
--- 261,272 ----
  
  (define (foo:cleanup)
!   (begin
!     (let ((test-file (foo:test-file-name)))
!       (if (file-exists? test-file)
! 	  (begin
! 	    ;; (format #t "removing ~a~%" test-file)
! 	    (system (string-append "rm " test-file)))))
!     (if (and (feature? 'readline.la) (bound? 'readline-write-history))
! 	(readline-write-history (tilde-expand "~/.foo/foo_history")))))
  
  (define (quit)

[foo-cvs] foo/elkfoo/scm toplevel.foo.in,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/scm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25637

Modified Files:
	toplevel.foo.in 
Log Message:
added support for (readline-[read | write]-history), backwards compatible to older readline extension

Index: toplevel.foo.in
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/toplevel.foo.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** toplevel.foo.in	11 Aug 2004 12:24:37 -0000	1.4
--- toplevel.foo.in	25 Aug 2004 23:16:33 -0000	1.5
***************
*** 238,242 ****
  	  (if (bound? 'foo:cleanup)
  	      (foo:cleanup))
! 	  (exit))))
  
  (provide 'foo)
--- 238,245 ----
  	  (if (bound? 'foo:cleanup)
  	      (foo:cleanup))
! 	  (exit)))
!     ;; load history (ignore errors)
!     (if (and (feature? 'readline.la) (bound? 'readline-read-history))
! 	(readline-read-history (tilde-expand "~/.foo/foo_history"))))
  
  (provide 'foo)

[foo-cvs] fooelk configure.ac,1.7,1.8

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/fooelk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24965

Modified Files:
	configure.ac 
Log Message:
commented out warning flags for compiling, cause it's too aweful

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/fooelk/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.ac	10 Aug 2004 02:28:40 -0000	1.7
--- configure.ac	25 Aug 2004 23:12:51 -0000	1.8
***************
*** 555,566 ****
  
  # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
! CFLAGS_warn="-Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
! AC_CACHE_CHECK([if \$CC accepts ${CFLAGS_warn}],
!   [ac_cv_c_Wwarn],
!   [CFLAGS="${CFLAGS_warn} ${CFLAGS_save}"
!    AC_TRY_COMPILE([],,ac_cv_c_Wwarn=yes, ac_cv_c_Wwarn=no)])
! if test "x${ac_cv_c_Wwarn}" != "xno"; then
!   CFLAGS_save="${CFLAGS_warn} ${CFLAGS_save}"
! fi
  
  dnl
--- 555,566 ----
  
  # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
! dnl CFLAGS_warn="-Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
! dnl AC_CACHE_CHECK([if \$CC accepts ${CFLAGS_warn}],
! dnl   [ac_cv_c_Wwarn],
! dnl   [CFLAGS="${CFLAGS_warn} ${CFLAGS_save}"
! dnl    AC_TRY_COMPILE([],,ac_cv_c_Wwarn=yes, ac_cv_c_Wwarn=no)])
! dnl if test "x${ac_cv_c_Wwarn}" != "xno"; then
! dnl   CFLAGS_save="${CFLAGS_warn} ${CFLAGS_save}"
! dnl fi
  
  dnl

[foo-cvs] fooelk/lib/readline readline.c,1.3,1.4 readline.h,1.2,1.3

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/fooelk/lib/readline
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24845

Modified Files:
	readline.c readline.h 
Log Message:
added primitives for reading and writing history to a file

Index: readline.c
===================================================================
RCS file: /cvsroot/foo/fooelk/lib/readline/readline.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** readline.c	10 Aug 2004 01:44:56 -0000	1.3
--- readline.c	25 Aug 2004 23:12:09 -0000	1.4
***************
*** 161,164 ****
--- 161,186 ----
  
  
+ Object
+ P_Readline_Read_History (Object path)
+ {
+   int result;
+ 
+   result = read_history(Get_String(path));
+ 
+   return Make_Integer(result);
+ }
+ 
+ 
+ Object
+ P_Readline_Write_History (Object path)
+ {
+   int result;
+ 
+   result = write_history(Get_String(path));
+ 
+   return Make_Integer(result);
+ }
+ 
+ 
  void
  elk_init_readline_readline (void)
***************
*** 172,175 ****
--- 194,199 ----
    Def_Prim(P_Readline_Add_History,	"readline-add-history",	1, 1,	EVAL);
    Def_Prim(P_Readline_Set_Prompt,	"readline-set-prompt",	1, 1,	EVAL);
+   Def_Prim(P_Readline_Read_History,	"readline-read-history",1, 1,	EVAL);
+   Def_Prim(P_Readline_Write_History,	"readline-write-history",1, 1,	EVAL);
  
    P_Provide(Intern("readline.la"));

Index: readline.h
===================================================================
RCS file: /cvsroot/foo/fooelk/lib/readline/readline.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** readline.h	7 Aug 2004 08:56:26 -0000	1.2
--- readline.h	25 Aug 2004 23:12:09 -0000	1.3
***************
*** 53,56 ****
--- 53,58 ----
  extern Object P_Readline_Set_Prompt (Object prompt);
  extern Object P_Readline_Completion (Object enable);
+ extern Object P_Readline_Read_History (Object path);
+ extern Object P_Readline_Write_History (Object path);
  
  #define Def_Prim Define_Primitive

[foo-cvs] foo/libfoo/src FOOGlobalsManager.m,1.6,1.7

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20304

Modified Files:
	FOOGlobalsManager.m 
Log Message:
fixed bug releated to AUTORELEASE: allocate sinetable and sinexoverxtable correctly

Index: FOOGlobalsManager.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOGlobalsManager.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FOOGlobalsManager.m	17 Aug 2004 06:47:13 -0000	1.6
--- FOOGlobalsManager.m	19 Aug 2004 20:51:05 -0000	1.7
***************
*** 73,78 ****
      {
        [self recycleAutoreleasePool];
!       _sineXoXHT = [NSMutableDictionary dictionary];
!       _fileHT = [NSMutableDictionary dictionary];
      }
  }
--- 73,78 ----
      {
        [self recycleAutoreleasePool];
!       _sineXoXHT = [[NSMutableDictionary alloc] init];
!       _fileHT = [[NSMutableDictionary alloc] init];
      }
  }

[foo-cvs] foo/libfoo/FOO FOOGlobalsManager.h,1.5,1.6

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/FOO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20782/libfoo/FOO

Modified Files:
	FOOGlobalsManager.h 
Log Message:
moved NSAutoreleasePool creation to FOOGlobalsManager.m (from fooinit.m).  call recycling function when context is created or unarchived

Index: FOOGlobalsManager.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOGlobalsManager.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FOOGlobalsManager.h	14 Aug 2004 06:12:18 -0000	1.5
--- FOOGlobalsManager.h	17 Aug 2004 06:47:13 -0000	1.6
***************
*** 89,92 ****
--- 89,94 ----
  + (void) setDefaultBlockSize: (int)size;
  
+ + (void) recycleAutoreleasePool;
+ 
  @end
  

[foo-cvs] foo/elkfoo/src fooinit.m,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20782/elkfoo/src

Modified Files:
	fooinit.m 
Log Message:
moved NSAutoreleasePool creation to FOOGlobalsManager.m (from fooinit.m).  call recycling function when context is created or unarchived

Index: fooinit.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/fooinit.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fooinit.m	13 Aug 2004 21:34:39 -0000	1.4
--- fooinit.m	17 Aug 2004 06:47:12 -0000	1.5
***************
*** 43,48 ****
  #include <FOO/FOOGlobalsManager.h>
  
- #import <Foundation/NSAutoreleasePool.h>
- 
  
  static SchemeObject
--- 43,46 ----
***************
*** 87,91 ****
  
    // autorelease pool
!   [[NSAutoreleasePool alloc] init];
  
  #ifdef HAVE_SIGACTION
--- 85,89 ----
  
    // autorelease pool
!   [FOOGlobalsManager recycleAutoreleasePool];
  
  #ifdef HAVE_SIGACTION

[foo-cvs] foo/libfoo/src FOOContext.m,1.6,1.7 FOOGlobalsManager.m,1.5,1.6

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20782/libfoo/src

Modified Files:
	FOOContext.m FOOGlobalsManager.m 
Log Message:
moved NSAutoreleasePool creation to FOOGlobalsManager.m (from fooinit.m).  call recycling function when context is created or unarchived

Index: FOOGlobalsManager.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOGlobalsManager.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FOOGlobalsManager.m	14 Aug 2004 06:12:34 -0000	1.5
--- FOOGlobalsManager.m	17 Aug 2004 06:47:13 -0000	1.6
***************
*** 45,48 ****
--- 45,49 ----
  #import <Foundation/NSValue.h>
  #import <Foundation/NSDictionary.h>
+ #import <Foundation/NSAutoreleasePool.h>
  
  #include "FOO/FOOGlobalsManager.h"
***************
*** 53,56 ****
--- 54,58 ----
  
  
+ static NSAutoreleasePool *_pool = nil;
  static int _trace = NO;
  static FOOSineTable *_sineTable = nil;
***************
*** 70,73 ****
--- 72,76 ----
    if (self == [FOOGlobalsManager class])
      {
+       [self recycleAutoreleasePool];
        _sineXoXHT = [NSMutableDictionary dictionary];
        _fileHT = [NSMutableDictionary dictionary];
***************
*** 199,201 ****
--- 202,215 ----
  }
  
+ 
+ + (void) recycleAutoreleasePool
+ {
+   if (_pool != nil)
+     {
+       RELEASE(_pool);
+     }
+ 
+   _pool = [[NSAutoreleasePool alloc] init];
+ }
+ 
  @end

Index: FOOContext.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOContext.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FOOContext.m	15 Aug 2004 20:30:16 -0000	1.6
--- FOOContext.m	17 Aug 2004 06:47:13 -0000	1.7
***************
*** 111,114 ****
--- 111,117 ----
    RELEASE(unarchiver);
  
+   // by the way
+   [FOOGlobalsManager recycleAutoreleasePool];
+ 
    return self;
  }
***************
*** 158,162 ****
  {
    NSZone *zone = [self zone];
!     
    [super init];
    _numberOfChannels = n;
--- 161,165 ----
  {
    NSZone *zone = [self zone];
! 
    [super init];
    _numberOfChannels = n;
***************
*** 171,174 ****
--- 174,180 ----
    _locked = NO;
  
+   // by the way
+   [FOOGlobalsManager recycleAutoreleasePool];
+ 
    return self;
  }

[foo-cvs] foo/libfoo/modules/orthodox FOOMFof.m,1.5,1.6

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/modules/orthodox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15451

Modified Files:
	FOOMFof.m 
Log Message:
added archiving method

Index: FOOMFof.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FOOMFof.m	16 Aug 2004 05:20:49 -0000	1.5
--- FOOMFof.m	17 Aug 2004 06:05:49 -0000	1.6
***************
*** 489,494 ****
--- 489,507 ----
  - (void) encodeWithCoder: (NSCoder *)coder
  {
+   double initPhase = _fof.inputs.phase;
+ 
    [super encodeWithCoder: coder];
  
+   if ([coder allowsKeyedCoding])
+     {
+       [coder encodeDouble: _beginT forKey: @"FOOMFof:beginT"];
+       [coder encodeDouble: initPhase forKey: @"FOOMFof:initPhase"];
+     }
+   else
+     {
+       [coder encodeValueOfObjCType: @encode(double) at: &_beginT];
+       [coder encodeValueOfObjCType: @encode(double) at: &initPhase];
+     }
+ 
    return;
  }
***************
*** 497,502 ****
--- 510,537 ----
  - (id) initWithCoder: (NSCoder *)coder
  {
+   double initPhase;
+ 
    self = [super initWithCoder: coder];
  
+   if ([coder allowsKeyedCoding])
+     {
+       _beginT = [coder decodeDoubleForKey: @"FOOMFof:beginT"];
+       initPhase = [coder decodeDoubleForKey: @"FOOMFof:initPhase"];
+     }
+   else
+     {
+       [coder decodeValueOfObjCType: @encode(double) at: &_beginT];
+       [coder decodeValueOfObjCType: @encode(double) at: &initPhase];
+     }
+ 
+   _first = YES;
+ 
+   if (fof_init_list(&(_fof.list)) == NO)
+     {
+       FOO_ERROR(YES, NO);
+     }
+ 
+   _fof.inputs.phase = initPhase;
+ 
    return self;
  }

[foo-cvs] foo/libfoo/src FOOModule.m,1.6,1.7

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13617/src

Modified Files:
	FOOModule.m 
Log Message:
removed _output member and references to it

Index: FOOModule.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOModule.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FOOModule.m	15 Aug 2004 17:50:44 -0000	1.6
--- FOOModule.m	17 Aug 2004 05:51:56 -0000	1.7
***************
*** 80,92 ****
      }
    [_inputs replaceObjectAtIndex: index withObject: module];
-   [module connectOutput: self];
- 
-   return self;
- }
- 
- 
- - (FOOModule *) connectOutput: (FOOModule *)module
- {
-   _output = module;
  
    return self;
--- 80,83 ----
***************
*** 276,285 ****
      {
        [coder encodeObject: _inputs forKey: @"FOOModule:inputs"];
-       [coder encodeObject: _output forKey: @"FOOOutput:output"];
      }
    else
      {
        [coder encodeObject: _inputs];
-       [coder encodeObject: _output];
      }
  
--- 267,274 ----
***************
*** 295,304 ****
      {
        _inputs = RETAIN([coder decodeObjectForKey: @"FOOModule:inputs"]);
-       _output = RETAIN([coder decodeObjectForKey: @"FOOModule:output"]);
      }
    else
      {
        _inputs = RETAIN([coder decodeObject]);
-       _output = RETAIN([coder decodeObject]);
      }
  
--- 284,291 ----

[foo-cvs] foo/libfoo/FOO FOOModule.h,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/FOO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13617/FOO

Modified Files:
	FOOModule.h 
Log Message:
removed _output member and references to it

Index: FOOModule.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/FOO/FOOModule.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOModule.h	15 Aug 2004 17:51:48 -0000	1.4
--- FOOModule.h	17 Aug 2004 05:51:53 -0000	1.5
***************
*** 80,84 ****
  {
    NSMutableArray *_inputs;
-   id _output;	/* NOT USED !!! */
    FOOBuffer *_buffer;
    int _active;
--- 80,83 ----
***************
*** 89,93 ****
  - (FOOModule *) reset;
  - (FOOModule *) connectInput: (int)index to: (FOOModule *)module;
- - (FOOModule *) connectOutput: (FOOModule *)module;
  - (FOOModule *) defaultInput;
  - (BOOL) activate;
--- 88,91 ----

[foo-cvs] foo/elkfoo/examples/scripts sine.foo,1.1,1.2

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/examples/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19142

Modified Files:
	sine.foo 
Log Message:
added comments and verbose output

Index: sine.foo
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/examples/scripts/sine.foo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sine.foo	12 Aug 2004 23:15:38 -0000	1.1
--- sine.foo	16 Aug 2004 19:50:05 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  ;; (c) 2004 rumori
  
+ ;; checking command line
  (if (< (length (command-line-args)) 3)
      (begin
***************
*** 10,16 ****
        (quit)))
  
  (define duration (string->number (list-ref (command-line-args) 1)))
  (define freq (string->number (list-ref (command-line-args) 2)))
  
  (syn 1 duration (output~ 1 (sine~ (~ freq))))
! (play)
--- 11,31 ----
        (quit)))
  
+ (format #t "~a script example~%" (car (command-line-args)))
+ (format #t "creating, playing and removing a test-file.~%")
+ 
+ ;; extract parameters from command line
  (define duration (string->number (list-ref (command-line-args) 1)))
  (define freq (string->number (list-ref (command-line-args) 2)))
  
+ (format #t "duration: ~a  frequency: ~a~%" duration freq)
+ 
+ (format #t "synthesizing...~%")
+ 
+ ;; here we do the major work
  (syn 1 duration (output~ 1 (sine~ (~ freq))))
! 
! (format #t "~%playing using '~a'~%" foo-default-play-command)
! 
! (format #t "exiting (will remove temporary file as well)~%")
! 
! ;; done

[foo-cvs] foo/libfoo/modules/orthodox FOOMAdd.m,1.3,1.4 FOOMBandlimitedNoise.m,1.3,1.4 FOOMConstant.m,1.3,1.4 FOOMConstantBiquad.m,1.3,1.4 FOOMConstantTwoPole.m,1.3,1.4 FOOMConstantTwoPoleTwoZero.m,1.3,1.4 FOOMDiff.m,1.3,1.4 FOOMDirac.m,1.3,1.4 FOOMDiv.m,1.3,1.4 FOOMExpon.m,1.4,1.5 FOOMFiltreVariableEtat.m,1.3,1.4 FOOMFof.m,1.4,1.5 FOOMGate.m,1.4,1.5 FOOMInteg.m,1.3,1.4 FOOMLine.m,1.4,1.5 FOOMMath.h,1.3,1.4 FOOMMath.m,1.3,1.4 FOOMMul.h,1.2,1.3 FOOMMul.m,1.2,1.3 FOOMNeg.h,1.2,1.3 FOOMNeg.m,1.2,1.3 FOOMOscillator.m,1.3,1.4 FOOMSub.h,1.2,1.3 FOOMSub.m,1.2,1.3 FOOMVariableTwoPole.h,1.2,1.3 FOOMVariableTwoPole.m,1.2,1.3

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/modules/orthodox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31999

Modified Files:
	FOOMAdd.m FOOMBandlimitedNoise.m FOOMConstant.m 
	FOOMConstantBiquad.m FOOMConstantTwoPole.m 
	FOOMConstantTwoPoleTwoZero.m FOOMDiff.m FOOMDirac.m FOOMDiv.m 
	FOOMExpon.m FOOMFiltreVariableEtat.m FOOMFof.m FOOMGate.m 
	FOOMInteg.m FOOMLine.m FOOMMath.h FOOMMath.m FOOMMul.h 
	FOOMMul.m FOOMNeg.h FOOMNeg.m FOOMOscillator.m FOOMSub.h 
	FOOMSub.m FOOMVariableTwoPole.h FOOMVariableTwoPole.m 
Log Message:
added some archiving functions.  seemed not to be strictly necessary, but looks better to fully comply with <NSCoding> protocol.  changed coding style for archiving methods to return (id) rather than specific module type.




Index: FOOMConstantTwoPole.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPole.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMConstantTwoPole.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMConstantTwoPole.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 175,179 ****
  
  
! - (FOOMConstantTwoPole *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 175,179 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMInteg.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMInteg.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMInteg.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMInteg.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 100,104 ****
  
  
! - (FOOMInteg *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 100,104 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMDiv.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiv.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMDiv.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMDiv.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 97,101 ****
  
  
! - (FOOMDiv *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 97,101 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMDiff.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDiff.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMDiff.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMDiff.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 97,101 ****
  
  
! - (FOOMDiff *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 97,101 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMConstantTwoPoleTwoZero.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantTwoPoleTwoZero.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMConstantTwoPoleTwoZero.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMConstantTwoPoleTwoZero.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 168,172 ****
  
  
! - (FOOMConstantTwoPoleTwoZero *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 168,172 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMExpon.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMExpon.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOMExpon.m	15 Aug 2004 17:42:37 -0000	1.4
--- FOOMExpon.m	16 Aug 2004 05:20:49 -0000	1.5
***************
*** 171,175 ****
  
  
! - (FOOMExpon *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 171,175 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMNeg.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNeg.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMNeg.m	15 Aug 2004 17:42:37 -0000	1.2
--- FOOMNeg.m	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 68,70 ****
--- 68,90 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
+ 
  @end

Index: FOOMDirac.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMDirac.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMDirac.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMDirac.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 110,114 ****
  
  
! - (FOOMDirac *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 110,114 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMOscillator.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMOscillator.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMOscillator.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMOscillator.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 164,168 ****
  
  
! - (FOOMOscillator *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 164,168 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMSub.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMSub.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMSub.m	1 Aug 2004 23:25:34 -0000	1.2
--- FOOMSub.m	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 93,95 ****
--- 93,115 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
+ 
  @end

Index: FOOMFof.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFof.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOMFof.m	15 Aug 2004 17:42:37 -0000	1.4
--- FOOMFof.m	16 Aug 2004 05:20:49 -0000	1.5
***************
*** 495,499 ****
  
  
! - (FOOMFof *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 495,499 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMSub.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMSub.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMSub.h	4 Aug 2004 06:20:31 -0000	1.2
--- FOOMSub.h	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 40,45 ****
  #include <FOO/FOOModule.h>
  
! @interface FOOMSub : FOOModule
  {
  }
  @end
--- 40,47 ----
  #include <FOO/FOOModule.h>
  
! 
! @interface FOOMSub : FOOModule <NSCoding>
  {
+ 
  }
  @end

Index: FOOMConstantBiquad.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstantBiquad.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMConstantBiquad.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMConstantBiquad.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 179,183 ****
  
  
! - (FOOMConstantBiquad *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 179,183 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMMath.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMath.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMMath.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMMath.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 38,80 ****
  
  
! #define MAKE_CLASS_IMPL1(name, operation)		\
!     @implementation name				\
!     - (BOOL) compute					\
!     {							\
! 	sample_t *in, *out;				\
! 	int n = BLOCKSIZE;				\
! 	COMPUTE_PROLOGUE;				\
! 	[INPUT(0) compute];				\
! 	in  = DATA_OF_MOD(INPUT(0));			\
! 	out = DATA_OF_BUF(_buffer);			\
! 	while (n--)					\
!           {						\
! 	    *out++ = operation(*in++);			\
!           }						\
! 	COMPUTE_EPILOGUE;				\
!     }							\
!     @end
      
! #define MAKE_CLASS_IMPL2(name, operation)		\
!     @implementation name				\
!     - (BOOL) compute					\
!     {							\
! 	sample_t *in1, *in2, *out;			\
! 	int n = BLOCKSIZE;				\
! 	COMPUTE_PROLOGUE;				\
! 	[INPUT(0) compute];				\
! 	[INPUT(1) compute];				\
! 	in1  = DATA_OF_MOD(INPUT(0));			\
! 	in2  = DATA_OF_MOD(INPUT(1));			\
! 	out = DATA_OF_BUF(_buffer);			\
! 	while (n--)					\
!           {						\
! 	    *out++ = operation(*in1, *in2);		\
! 	    in1++;					\
! 	    in2++;					\
! 	  }						\
! 	COMPUTE_EPILOGUE;				\
!     }							\
!     @end
  
  
--- 38,105 ----
  
  
! #define MAKE_CLASS_IMPL1(name, operation)	\
! @implementation name				\
! - (BOOL) compute				\
! {						\
!   sample_t *in, *out;				\
!   int n = BLOCKSIZE;				\
!   COMPUTE_PROLOGUE;				\
!   [INPUT(0) compute];				\
!   in  = DATA_OF_MOD(INPUT(0));			\
!   out = DATA_OF_BUF(_buffer);			\
!   while (n--)					\
!     {						\
!       *out++ = operation(*in++);		\
!     }						\
!   COMPUTE_EPILOGUE;				\
! }						\
! 						\
! - (void) encodeWithCoder: (NSCoder *)coder	\
! {						\
!   [super encodeWithCoder: coder];		\
!   return;					\
! }						\
! 						\
! - (id) initWithCoder: (NSCoder *)coder		\
! {						\
!   self = [super initWithCoder: coder];		\
!   return self;					\
! }						\
! @end
      
! 
! #define MAKE_CLASS_IMPL2(name, operation)	\
! @implementation name				\
! - (BOOL) compute				\
! {						\
!   sample_t *in1, *in2, *out;			\
!   int n = BLOCKSIZE;				\
!   COMPUTE_PROLOGUE;				\
!   [INPUT(0) compute];				\
!   [INPUT(1) compute];				\
!   in1  = DATA_OF_MOD(INPUT(0));			\
!   in2  = DATA_OF_MOD(INPUT(1));			\
!   out = DATA_OF_BUF(_buffer);			\
!   while (n--)					\
!     {						\
!       *out++ = operation(*in1, *in2);		\
!       in1++;					\
!       in2++;					\
!     }						\
!   COMPUTE_EPILOGUE;				\
! }						\
! 						\
! - (void) encodeWithCoder: (NSCoder *)coder	\
! {						\
!   [super encodeWithCoder: coder];		\
!   return;					\
! }						\
! 						\
! - (id) initWithCoder: (NSCoder *)coder		\
! {						\
!   self = [super initWithCoder: coder];		\
!   return self;					\
! }						\
! @end
  
  
***************
*** 92,95 ****
--- 117,139 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
  @end
  
***************
*** 114,117 ****
--- 158,181 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
+ 
  @end
  

Index: FOOMConstant.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMConstant.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMConstant.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMConstant.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 89,93 ****
  
  
! - (FOOMConstant *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 89,93 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMNeg.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMNeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMNeg.h	4 Aug 2004 06:20:31 -0000	1.2
--- FOOMNeg.h	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 40,45 ****
  #include <FOO/FOOModule.h>
  
! @interface FOOMNeg : FOOModule
  {
  }
  @end
--- 40,47 ----
  #include <FOO/FOOModule.h>
  
! 
! @interface FOOMNeg : FOOModule <NSCoding>
  {
+ 
  }
  @end

Index: FOOMLine.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMLine.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOMLine.m	15 Aug 2004 17:42:37 -0000	1.4
--- FOOMLine.m	16 Aug 2004 05:20:49 -0000	1.5
***************
*** 171,175 ****
  
  
! - (FOOMLine *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 171,175 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMMath.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMath.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMMath.h	15 Aug 2004 16:48:55 -0000	1.3
--- FOOMMath.h	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 55,64 ****
  #endif
  
! @interface FOOMMath1 : FOOModule
  {
  }
  @end
  
! @interface FOOMMath2 : FOOModule
  {
  }
--- 55,64 ----
  #endif
  
! @interface FOOMMath1 : FOOModule <NSCoding>
  {
  }
  @end
  
! @interface FOOMMath2 : FOOModule <NSCoding>
  {
  }
***************
*** 66,70 ****
  
  #define MAKE_CLASS_INT1(name)			\
!     @interface name : FOOMMath1	\
      {						\
      }						\
--- 66,70 ----
  
  #define MAKE_CLASS_INT1(name)			\
!     @interface name : FOOMMath1	<NSCoding>	\
      {						\
      }						\
***************
*** 72,76 ****
  
  #define MAKE_CLASS_INT2(name)			\
!     @interface name : FOOMMath2	\
      {						\
      }						\
--- 72,76 ----
  
  #define MAKE_CLASS_INT2(name)			\
!     @interface name : FOOMMath2	<NSCoding>	\
      {						\
      }						\

Index: FOOMAdd.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMAdd.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMAdd.m	15 Aug 2004 17:42:36 -0000	1.3
--- FOOMAdd.m	16 Aug 2004 05:20:48 -0000	1.4
***************
*** 111,115 ****
  
  
! - (FOOMAdd *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 111,115 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMMul.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMul.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMMul.h	4 Aug 2004 06:20:31 -0000	1.2
--- FOOMMul.h	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 40,44 ****
  #include <FOO/FOOModule.h>
  
! @interface FOOMMul : FOOModule
  {
  }
--- 40,45 ----
  #include <FOO/FOOModule.h>
  
! 
! @interface FOOMMul : FOOModule <NSCoding>
  {
  }

Index: FOOMGate.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMGate.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOMGate.m	15 Aug 2004 17:42:37 -0000	1.4
--- FOOMGate.m	16 Aug 2004 05:20:49 -0000	1.5
***************
*** 154,158 ****
  
  
! - (FOOMGate *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 154,158 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMMul.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMMul.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMMul.m	15 Aug 2004 17:42:37 -0000	1.2
--- FOOMMul.m	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 85,87 ****
--- 85,107 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
+ 
  @end

Index: FOOMVariableTwoPole.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMVariableTwoPole.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMVariableTwoPole.m	15 Aug 2004 17:42:37 -0000	1.2
--- FOOMVariableTwoPole.m	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 164,166 ****
--- 164,186 ----
  }
  
+ 
+ /*
+  * archiving methods
+  */
+ 
+ - (void) encodeWithCoder: (NSCoder *)coder
+ {
+   [super encodeWithCoder: coder];
+ 
+   return;
+ }
+ 
+ 
+ - (id) initWithCoder: (NSCoder *)coder
+ {
+   self = [super initWithCoder: coder];
+ 
+   return self;
+ }
+ 
  @end

Index: FOOMVariableTwoPole.h
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMVariableTwoPole.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FOOMVariableTwoPole.h	4 Aug 2004 06:20:31 -0000	1.2
--- FOOMVariableTwoPole.h	16 Aug 2004 05:20:49 -0000	1.3
***************
*** 41,45 ****
  #include <FOO/FOOGlobal.h>
  
! @interface FOOMVariableTwoPole : FOOEagerModule
  {
    sample_t _y1, _y2;
--- 41,45 ----
  #include <FOO/FOOGlobal.h>
  
! @interface FOOMVariableTwoPole : FOOEagerModule <NSCoding>
  {
    sample_t _y1, _y2;

Index: FOOMFiltreVariableEtat.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMFiltreVariableEtat.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMFiltreVariableEtat.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMFiltreVariableEtat.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 144,148 ****
  
  
! - (FOOMFiltreVariableEtat *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 144,148 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

Index: FOOMBandlimitedNoise.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/modules/orthodox/FOOMBandlimitedNoise.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FOOMBandlimitedNoise.m	15 Aug 2004 17:42:37 -0000	1.3
--- FOOMBandlimitedNoise.m	16 Aug 2004 05:20:49 -0000	1.4
***************
*** 162,166 ****
  
  
! - (FOOMBandlimitedNoise *) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];
--- 162,166 ----
  
  
! - (id) initWithCoder: (NSCoder *)coder
  {
    self = [super initWithCoder: coder];

[foo-cvs] foo/libfoo/src FOOSoundFile.m,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/libfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28029

Modified Files:
	FOOSoundFile.m 
Log Message:
minor fix.  set _fileName to nil instead of NULL after releasing, since NSObject, no C pointer

Index: FOOSoundFile.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOSoundFile.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FOOSoundFile.m	13 Aug 2004 21:38:01 -0000	1.4
--- FOOSoundFile.m	16 Aug 2004 04:48:27 -0000	1.5
***************
*** 62,66 ****
  
    _file = NULL;
!   _fileName = NULL;
    _dynamics = NULL;
    _cache.ptr = NULL;
--- 62,66 ----
  
    _file = NULL;
!   _fileName = nil;
    _dynamics = NULL;
    _cache.ptr = NULL;
***************
*** 76,80 ****
  
    _file = NULL;
!   _fileName = NULL;
    _dynamics = NULL;
    _cache.ptr = NULL;
--- 76,80 ----
  
    _file = NULL;
!   _fileName = nil;
    _dynamics = NULL;
    _cache.ptr = NULL;

[foo-cvs] foo/elkfoo/src modules.m,1.5,1.6 task.m,1.5,1.6 tell.m,1.15,1.16

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27421

Modified Files:
	modules.m task.m tell.m 
Log Message:
fixed more potentially doubled RELEASEs (we still need a strategy for creating and releasing NSAutoreleasePools constantly to really get rid of the memory)

Index: modules.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/modules.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** modules.m	15 Aug 2004 16:42:21 -0000	1.5
--- modules.m	16 Aug 2004 04:42:26 -0000	1.6
***************
*** 825,829 ****
    //     Alloca_Begin;
      
!   name = AUTORELEASE([NSString stringWithCString: Get_String(argv[1])]);
    if (argc == 3)
      {
--- 825,829 ----
    //     Alloca_Begin;
      
!   name = [NSString stringWithCString: Get_String(argv[1])];
    if (argc == 3)
      {

Index: task.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/task.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** task.m	15 Aug 2004 20:30:48 -0000	1.5
--- task.m	16 Aug 2004 04:42:26 -0000	1.6
***************
*** 346,350 ****
      }
  
!   filename = AUTORELEASE([NSString stringWithCString: output]);
    [context openOutput: filename
  	   addin:(int)((TASK_T(task)->incremental == 1) ||
--- 346,350 ----
      }
  
!   filename = [NSString stringWithCString: output];
    [context openOutput: filename
  	   addin:(int)((TASK_T(task)->incremental == 1) ||

Index: tell.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/tell.m,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tell.m	13 Aug 2004 21:34:39 -0000	1.15
--- tell.m	16 Aug 2004 04:42:26 -0000	1.16
***************
*** 178,188 ****
      ret = A_Get_Object_From_Buffer(valbuf, rettype);
  
!   RELEASE(invoc);
!   free(valbuf);
  
!   if (Nullp(ret))
!     {
!       Primitive_Error("internal error with return");
!     }
    }
  
--- 178,187 ----
      ret = A_Get_Object_From_Buffer(valbuf, rettype);
  
!     free(valbuf);
  
!     if (Nullp(ret))
!       {
! 	Primitive_Error("internal error with return");
!       }
    }
  

[foo-cvs] foo/elkfoo/src soundfile.m,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26777

Modified Files:
	soundfile.m 
Log Message:
fixed bug: double AUTORELEASE()

Index: soundfile.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/soundfile.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** soundfile.m	13 Aug 2004 21:34:39 -0000	1.4
--- soundfile.m	16 Aug 2004 04:36:29 -0000	1.5
***************
*** 225,229 ****
      }
  
!   filename = AUTORELEASE([NSString stringWithCString: cname]);
    snd = [[FOOSoundFile alloc] initWithContext: nil];
    [snd initWithFile: filename];
--- 225,229 ----
      }
  
!   filename = [NSString stringWithCString: cname];
    snd = [[FOOSoundFile alloc] initWithContext: nil];
    [snd initWithFile: filename];

[foo-cvs] foo/elkfoo README,1.1,1.2

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22135

Modified Files:
	README 
Log Message:
added section on new (write-context)/(read-context) layout

Index: README
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	4 Aug 2004 07:13:08 -0000	1.1
--- README	15 Aug 2004 20:48:44 -0000	1.2
***************
*** 77,80 ****
--- 77,95 ----
  which can't be documented right now:
  
+ 
+ new archiving functions layout (backwards compatible)
+ -----------------------------------------------------
+ 
+ the canonical form for the archiving functions (write-context) and
+ (read-context) are now:
+ 
+ (write-context <context> [<filename|port> [<XML?>]])
+ (read-context [<filename|port>])
+ 
+ that way, backwards compatability is given.  the last argument to
+ (write-context) is a boolean specifying whether XML archive format or
+ native binary format should be used.
+ 
+ 
  scripting foo via the #! directive
  ----------------------------------

[foo-cvs] foo/elkfoo/include elkfoo.h,1.5,1.6

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19529/include

Modified Files:
	elkfoo.h 
Log Message:
adopted to new archiving interface in libfoo

Index: elkfoo.h
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/include/elkfoo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** elkfoo.h	13 Aug 2004 21:33:57 -0000	1.5
--- elkfoo.h	15 Aug 2004 20:30:48 -0000	1.6
***************
*** 51,54 ****
--- 51,55 ----
  
  #include <FOO/FOOObject.h>
+ #include <FOO/FOOContext.h>
  
  /*
***************
*** 83,88 ****
  extern SchemeObject V_Context;
  
! extern int Write_Context();
! extern int Read_Context();
  
  SchemeObject Get_Context(void);
--- 84,89 ----
  extern SchemeObject V_Context;
  
! extern int Write_Context (const char *, FOOContext *, BOOL);
! extern int Read_Context (const char *, FOOContext **);
  
  SchemeObject Get_Context(void);

[foo-cvs] foo/elkfoo/src context.m,1.8,1.9 task.m,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19529/src

Modified Files:
	context.m task.m 
Log Message:
adopted to new archiving interface in libfoo

Index: task.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/task.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** task.m	13 Aug 2004 21:34:39 -0000	1.4
--- task.m	15 Aug 2004 20:30:48 -0000	1.5
***************
*** 280,295 ****
    fclose(fp);
    sprintf(buffer, "%s/mix%04dc", dir, count);
!   if ((fp = fopen(buffer, "w+")) == NULL)
!     {
!       Primitive_Error("cannot create ~a",
! 		      Make_String(buffer, strlen(buffer)));
!     }
!   if (Write_Context(fp, CONTEXT_T(TASK_T(task)->context)->pointer) != 1)
      {
!       fclose(fp);
        Primitive_Error("cannot write context to ~a",
  		      Make_String(buffer, strlen(buffer)));
      }
!   fclose(fp);
    sprintf(buffer, "%s/mixcount", dir);
    if ((fp = fopen(buffer, "w+")) == NULL)
--- 280,296 ----
    fclose(fp);
    sprintf(buffer, "%s/mix%04dc", dir, count);
! //   if ((fp = fopen(buffer, "w+")) == NULL)
! //     {
! //       Primitive_Error("cannot create ~a",
! // 		      Make_String(buffer, strlen(buffer)));
! //     }
! //  if (Write_Context(fp, CONTEXT_T(TASK_T(task)->context)->pointer, NO) != 1)
!   if (Write_Context(buffer, CONTEXT_T(TASK_T(task)->context)->pointer, NO) != 1)
      {
!       //      fclose(fp);
        Primitive_Error("cannot write context to ~a",
  		      Make_String(buffer, strlen(buffer)));
      }
!   //  fclose(fp);
    sprintf(buffer, "%s/mixcount", dir);
    if ((fp = fopen(buffer, "w+")) == NULL)

Index: context.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/context.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** context.m	14 Aug 2004 06:13:35 -0000	1.8
--- context.m	15 Aug 2004 20:30:48 -0000	1.9
***************
*** 267,271 ****
  int
  Write_Context (const char *path,
! 	       FOOContext *context)
  {
    /* we have to implement the exception handler here macros are
--- 267,272 ----
  int
  Write_Context (const char *path,
! 	       FOOContext *context,
! 	       BOOL xml)
  {
    /* we have to implement the exception handler here macros are
***************
*** 275,279 ****
  
    //  NS_DURING
!   [context archiveToFile: [NSString stringWithCString: path]];
      //  NS_HANDLER
      // yet to implement
--- 276,280 ----
  
    //  NS_DURING
!   [context archiveToFile: [NSString stringWithCString: path] xmlFormat: xml];
      //  NS_HANDLER
      // yet to implement
***************
*** 290,293 ****
--- 291,295 ----
    SchemeObject context = argv[0], port = Null;
    const char *path;
+   BOOL xml = NO;
   
    Check_Context(context);
***************
*** 323,327 ****
      }
  
!   switch (Write_Context(path, CONTEXT_T(context)->pointer))
      {
      case -1:
--- 325,339 ----
      }
  
!   if (argc > 2)
!     {
!       Check_Type(argv[2], T_Boolean);
! 
!       if (Truep(argv[2]))
! 	{
! 	  xml = YES;
! 	}
!     }
! 
!   switch (Write_Context(path, CONTEXT_T(context)->pointer, xml))
      {
      case -1:
***************
*** 531,535 ****
      DP(P_Pop_Time_Frame,	"foo:context-pop-time-frame",	1, 1, EVAL);
      DP(P_Context_Time,		"foo:context-time",		1, 1, EVAL);
!     DP(P_Context_Write,		"foo:write-context",		1, 2, VARARGS);
      DP(P_Context_Read,		"foo:read-context",		0, 1, VARARGS);
      DP(P_Context_Copy,		"foo:copy-context",		1, 1, EVAL);
--- 543,547 ----
      DP(P_Pop_Time_Frame,	"foo:context-pop-time-frame",	1, 1, EVAL);
      DP(P_Context_Time,		"foo:context-time",		1, 1, EVAL);
!     DP(P_Context_Write,		"foo:write-context",		1, 3, VARARGS);
      DP(P_Context_Read,		"foo:read-context",		0, 1, VARARGS);
      DP(P_Context_Copy,		"foo:copy-context",		1, 1, EVAL);