[PD-cvs] externals/grill/flext/source fldsp.cpp,1.25,1.26 fldsp.h,1.12,1.13 flsupport.h,1.77,1.78

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18731/source

Modified Files:
	fldsp.cpp fldsp.h flsupport.h 
Log Message:
Max: use high-priority click instead of qelem for message-posting
fixed flext::Timer::At method
eliminated ChannelsIn/ChannelsOut
fix for flext_dsp @ Max
better STL support on OSX


Index: fldsp.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fldsp.h	26 Jan 2005 05:01:47 -0000	1.12
--- fldsp.h	12 Feb 2005 04:56:09 -0000	1.13
***************
*** 52,61 ****
  	int Blocksize() const { return blksz; }
      
- 	//! returns number of input channels
- 	int ChannelsIn() const { return chnsin; }
- 
- 	//! returns number of output channels
- 	int ChannelsOut() const { return chnsout; }
- 
  	//! typedef describing a signal vector
  #if FLEXT_SYS == FLEXT_SYS_JMAX
--- 52,55 ----

Index: flsupport.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** flsupport.h	28 Jan 2005 04:57:18 -0000	1.77
--- flsupport.h	12 Feb 2005 04:56:09 -0000	1.78
***************
*** 54,60 ****
  		void operator delete(void *blk);
  
  		#ifndef __MRC__ // doesn't allow new[] overloading?!
! 		void *operator new[](size_t bytes) { return operator new(bytes); }
! 		void operator delete[](void *blk) { operator delete(blk); }
  		#endif
  
--- 54,66 ----
  		void operator delete(void *blk);
  
+ 		inline void *operator new(size_t,void *p) { return p; }
+ 		inline void operator delete(void *,void *) {}
+ 
  		#ifndef __MRC__ // doesn't allow new[] overloading?!
! 		inline void *operator new[](size_t bytes) { return operator new(bytes); }
! 		inline void operator delete[](void *blk) { operator delete(blk); }
! 
! 		inline void *operator new[](size_t,void *p) { return p; }
! 		inline void operator delete[](void *,void *) {}
  		#endif
  

Index: fldsp.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** fldsp.cpp	26 Jan 2005 05:01:45 -0000	1.25
--- fldsp.cpp	12 Feb 2005 04:56:09 -0000	1.26
***************
*** 66,83 ****
  #endif
  
-     if(invecs) delete[] invecs;
-     if(outvecs) delete[] outvecs;
- 
- /*
  #if FLEXT_SYS == FLEXT_SYS_MAX
!     // switch off dsp as the dsp function might get called afterwards (?!)
      thisHdr()->z_disabled = true;
!     
      if(invecs) delete[] invecs;
      if(outvecs) delete[] outvecs;
- #elif FLEXT_SYS == FLEXT_SYS_PD
-     dspon = false;
- #endif
- */
  }
  
--- 66,76 ----
  #endif
  
  #if FLEXT_SYS == FLEXT_SYS_MAX
!     // switch off dsp as the dsp function might get called afterwards (different thread)
      thisHdr()->z_disabled = true;
! #endif
! 
      if(invecs) delete[] invecs;
      if(outvecs) delete[] outvecs;
  }
  
***************
*** 90,102 ****
  { 
      flext_dsp *obj = (flext_dsp *)(size_t)w[1];
! /*
! #ifdef FLEXT_DEBUG
!     if(!obj->thisHdr()) {
!         // object is already deleted!
!         ERRINTERNAL();
!         return w+3;
!     }
! #endif
! */
  #if FLEXT_SYS == FLEXT_SYS_MAX
      if(!obj->thisHdr()->z_disabled)
--- 83,87 ----
  { 
      flext_dsp *obj = (flext_dsp *)(size_t)w[1];
! 
  #if FLEXT_SYS == FLEXT_SYS_MAX
      if(!obj->thisHdr()->z_disabled)