[foo-cvs] foo/libfoo/src FOORegion.m, 1.8, 1.9 FOOSoundStream.m, 1.8, 1.9

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

Update of /cvsroot/foo/foo/libfoo/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11047

Modified Files:
	FOORegion.m FOOSoundStream.m 
Log Message:
fix for snd-region/snd-extract nesting

Index: FOORegion.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOORegion.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FOORegion.m	22 Mar 2009 18:59:22 -0000	1.8
--- FOORegion.m	9 Apr 2009 09:55:58 -0000	1.9
***************
*** 57,61 ****
        FOO_ERROR(YES, self);
      }
!   _substrate = RETAIN(substrate); // RETAIN?
    _offset = rint(off * [substrate getSamplingRate]);
    _size = rint(siz * [substrate getSamplingRate]);
--- 57,61 ----
        FOO_ERROR(YES, self);
      }
!   _substrate = RETAIN(substrate);
    _offset = rint(off * [substrate getSamplingRate]);
    _size = rint(siz * [substrate getSamplingRate]);
***************
*** 67,71 ****
  
    return self;
! }
  
  
--- 67,71 ----
  
    return self;
! } // initWithSubstrate:offset:size:rev:
  
  
***************
*** 74,78 ****
    RELEASE(_substrate);
    [super dealloc];
! } //dealloc
  
  
--- 74,78 ----
    RELEASE(_substrate);
    [super dealloc];
! } // dealloc
  
  
***************
*** 124,128 ****
  {
    return _size;
! }
  
  
--- 124,128 ----
  {
    return _size;
! } // size
  
  
***************
*** 130,134 ****
  {
    return [_substrate getSamplingRate];
! }
  
  
--- 130,134 ----
  {
    return [_substrate getSamplingRate];
! } // getSamplingRate
  
  
***************
*** 136,140 ****
  {
    return [_substrate getChannelCount];
! }
  
  /*
--- 136,141 ----
  {
    return [_substrate getChannelCount];
! } // getChannelCount
! 
  
  /*

Index: FOOSoundStream.m
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/src/FOOSoundStream.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FOOSoundStream.m	22 Mar 2009 18:59:22 -0000	1.8
--- FOOSoundStream.m	9 Apr 2009 09:55:58 -0000	1.9
***************
*** 48,58 ****
  			       channel: (int)channel
  {
- //   if ([substrate isKindOfClass: [FOOSoundFile class]] == NO)
- //     {
- //       FOO_ERROR(YES, self);
- //     }
- //   _soundFile = RETAIN((FOOSoundFile *)substrate); // RETAIN?
- 
- // added for generalization to substrate
    if ([substrate isKindOfClass: [FOOSoundFile class]] == NO &&
        [substrate isKindOfClass: [FOOSoundStream class]] == NO &&
--- 48,51 ----
***************
*** 61,68 ****
        FOO_ERROR(YES, self);
      }
!   _substrate = RETAIN(substrate); // RETAIN?
!   //end added
!   _channelNumber = channel - 1;
!   //  if (_channelNumber < 0 || _channelNumber >= [_soundFile getChannelCount])
    if (_channelNumber < 0 || _channelNumber >= [_substrate getChannelCount])
      {
--- 54,60 ----
        FOO_ERROR(YES, self);
      }
!   _substrate = RETAIN(substrate);
!   _channelNumber = channel;
! 
    if (_channelNumber < 0 || _channelNumber >= [_substrate getChannelCount])
      {
***************
*** 71,80 ****
  
    return self;
! }
  
  
  - (void) dealloc
  {
-   //  RELEASE(_soundFile);
    RELEASE(_substrate);
    [super dealloc];
--- 63,71 ----
  
    return self;
! } // initWithSubstrate:channel:
  
  
  - (void) dealloc
  {
    RELEASE(_substrate);
    [super dealloc];
***************
*** 87,91 ****
  	    channel: (int)channel
  {
!   if (channel - 1 != _channelNumber)
      {
        FOO_ERROR(YES, self);
--- 78,83 ----
  	    channel: (int)channel
  {
!   // channel == -1: sum up all channels, here: our channel
!   if (channel != -1 && channel != _channelNumber)
      {
        FOO_ERROR(YES, self);
***************
*** 94,98 ****
  	       offset: o
  	       size: s];
! }
  
  
--- 86,90 ----
  	       offset: o
  	       size: s];
! } // getSamples:offset:size:channel
  
  
***************
*** 105,127 ****
  		     size: s
  		     channel: _channelNumber];
! //   return [_soundFile getSamples: b
! // 		     offset: o
! // 		     size: s
! // 		     channel: _channelNumber];
! }
  
  
  - (long) size
  {
-   //  return [_soundFile size];
    return [_substrate size];
! }
  
  
  - (double) getSamplingRate
  {
-   //  return [_soundFile getSamplingRate];
    return [_substrate getSamplingRate];
! }
  
  
--- 97,113 ----
  		     size: s
  		     channel: _channelNumber];
! } // getSamples:offset:size
  
  
  - (long) size
  {
    return [_substrate size];
! } // size
  
  
  - (double) getSamplingRate
  {
    return [_substrate getSamplingRate];
! } // getSamplingRate
  
  
***************
*** 129,133 ****
  {
    return 1; // FOOSoundStream is mono
! }
  
  
--- 115,119 ----
  {
    return 1; // FOOSoundStream is mono
! } // getChannelCount
  
  
***************
*** 142,152 ****
    if ([coder allowsKeyedCoding])
      {
!       //      [coder encodeObject: _soundFile forKey: @"FOOSoundStream:soundFile"];
!       [coder encodeObject: _substrate forKey: @"FOOSoundStream:soundFile"];
        [coder encodeInt: _channelNumber forKey: @"FOOSoundStream:channelNumber"];
      }
    else
      {
-       //      [coder encodeObject: _soundFile];
        [coder encodeObject: _substrate];
        [coder encodeValueOfObjCType: @encode(int) at: &_channelNumber];
--- 128,136 ----
    if ([coder allowsKeyedCoding])
      {
!       [coder encodeObject: _substrate forKey: @"FOOSoundStream:substrate"];
        [coder encodeInt: _channelNumber forKey: @"FOOSoundStream:channelNumber"];
      }
    else
      {
        [coder encodeObject: _substrate];
        [coder encodeValueOfObjCType: @encode(int) at: &_channelNumber];
***************
*** 154,158 ****
  
    return;
! }
  
  
--- 138,142 ----
  
    return;
! } // encodeWithCoder:
  
  
***************
*** 163,167 ****
    if ([coder allowsKeyedCoding])
      {
-       //      _soundFile = RETAIN([coder decodeObjectForKey: @"FOOSoundStream:soundFile"]);
        _substrate = RETAIN([coder decodeObjectForKey: @"FOOSoundStream:substrate"]);
        _channelNumber = [coder decodeIntForKey: @"FOOSoundStream:channelNumber"];
--- 147,150 ----
***************
*** 169,173 ****
    else
      {
-       //      _soundFile = RETAIN([coder decodeObject]);
        _substrate = RETAIN([coder decodeObject]);
        [coder decodeValueOfObjCType: @encode(int) at: &_channelNumber];
--- 152,155 ----
***************
*** 175,179 ****
  
    return self;
! }
  
  @end
--- 157,161 ----
  
    return self;
! } // initWithCoder:
  
  @end