[foo-cvs] foo/libfoo/include FOORegion.h,1.1.1.1,1.2 FOOSoundFile.h,1.1.1.1,1.2 FOOSoundStream.h,1.1.1.1,1.2 FOOSubstrate.h,1.1.1.1,1.2

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

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;