[Scopeapp-cvs]scopeapp/src InputSampler.h,1.3,1.4

[<sco...@li...>]

Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv3725

Modified Files:
	InputSampler.h 
Log Message:
Work around forward reference bug in GCC


Index: InputSampler.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/InputSampler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InputSampler.h	25 Jun 2002 01:41:30 -0000	1.3
--- InputSampler.h	18 Jul 2002 07:34:46 -0000	1.4
***************
*** 29,34 ****
  typedef float Sample;
  
! // Forward declaration
! @protocol InputHandler;
  
  // **********
--- 29,48 ----
  typedef float Sample;
  
! // **********
! // Protocol for an object which handles sampled sound data
! // **********
! @protocol InputHandler
! 
! // Process the given blocks of data from the given input sampler.
! // inData points to an array of pointers to arrays of Sample
! // Warning: this function must be thread-safe, as it may be called from
! // the sampler's thread.
! -(id) processData: (Sample**) inData
! 		length: (unsigned long) frameCount
! 		channels: (int) channelCount
! 		rate: (float) sampleRate
! 		fromSampler: (id) sampler;
! 
! @end
  
  // **********
***************
*** 38,42 ****
  
  // init a sampler with a given owner object
! -(id) initWithOwner: (id <InputHandler>) owner;
  
  // return YES if the sampler has an input settings dialog it can show
--- 52,56 ----
  
  // init a sampler with a given owner object
! -(id) initWithOwner: (id <InputHandler, NSObject>) owner;
  
  // return YES if the sampler has an input settings dialog it can show
***************
*** 76,96 ****
  // return the number of channels in the input data
  -(char) channelCount;
- 
- @end
- 
- // **********
- // Protocol for an object which handles sampled sound data
- // **********
- @protocol InputHandler
- 
- // Process the given blocks of data from the given input sampler.
- // inData points to an array of pointers to arrays of Sample
- // Warning: this function must be thread-safe, as it may be called from
- // the sampler's thread.
- -(id) processData: (Sample**) inData
- 		length: (unsigned long) frameCount
- 		channels: (int) channelCount
- 		rate: (float) sampleRate
- 		fromSampler: (id <InputSampler, NSObject>) sampler;
  
  @end
--- 90,93 ----