[PD-cvs] pd/src s_audio_asio.cpp,1.1.2.1,1.1.2.2

[Tim Blechmann]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18818

Modified Files:
      Tag: devel_0_37
	s_audio_asio.cpp 
Log Message:
 

Index: s_audio_asio.cpp
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** s_audio_asio.cpp	4 Nov 2004 20:22:44 -0000	1.1.2.1
--- s_audio_asio.cpp	4 Nov 2004 21:42:59 -0000	1.1.2.2
***************
*** 52,55 ****
--- 52,57 ----
  void float32toInt16(float* inbuffer, void* outbuffer, long frames);
  void Int16tofloat32(void* inbuffer, float* outbuffer, long frames);
+ void float32toInt24(float* inbuffer, void* outbuffer, long frames);
+ void Int24tofloat32(void* inbuffer, float* outbuffer, long frames);
  void float32toInt32(float* inbuffer, void* outbuffer, long frames);
  void Int32tofloat32(void* inbuffer, float* outbuffer, long frames);
***************
*** 539,545 ****
  	case ASIOSTInt24LSB:		// used for 20 bits as well
  		float32toInt24(source, dest, bufsize);		
! 
  	case ASIOSTInt32LSB:
  		float32toInt32(source, dest, bufsize);		
  
  	case ASIOSTFloat64LSB: 		// IEEE 754 64 bit double float, as found on Intel x86 architecture
--- 541,548 ----
  	case ASIOSTInt24LSB:		// used for 20 bits as well
  		float32toInt24(source, dest, bufsize);		
! 		break;
  	case ASIOSTInt32LSB:
  		float32toInt32(source, dest, bufsize);		
+ 		break;
  
  	case ASIOSTFloat64LSB: 		// IEEE 754 64 bit double float, as found on Intel x86 architecture
***************
*** 590,594 ****
  	case ASIOSTInt32LSB:
  		Int32tofloat32(source, dest, bufsize);		
! 		break
  
  	case ASIOSTFloat64LSB: 		// IEEE 754 64 bit double float, as found on Intel x86 architecture
--- 593,597 ----
  	case ASIOSTInt32LSB:
  		Int32tofloat32(source, dest, bufsize);		
! 		break;
  
  	case ASIOSTFloat64LSB: 		// IEEE 754 64 bit double float, as found on Intel x86 architecture
***************
*** 621,625 ****
  
  #define SCALE_INT16 32767.f       /* (- (expt 2 15) 1) */
! #define SCALE_INT32 8388607.f     /* (- (expt 2 23) 1) */
  #define SCALE_INT32 2147483647.f  /* (- (expt 2 31) 1) */
  
--- 624,628 ----
  
  #define SCALE_INT16 32767.f       /* (- (expt 2 15) 1) */
! #define SCALE_INT24 8388607.f     /* (- (expt 2 23) 1) */
  #define SCALE_INT32 2147483647.f  /* (- (expt 2 31) 1) */
  
***************
*** 644,648 ****
  void float32toInt24(float* inbuffer, void* outbuffer, long frames)
  {
! 	long* out = (int*)outbuffer;
  	while (frames--)
  	{
--- 647,651 ----
  void float32toInt24(float* inbuffer, void* outbuffer, long frames)
  {
! 	int* out = (int*)outbuffer;
  	while (frames--)
  	{
***************
*** 651,657 ****
  }
  
! void Int32tofloat24(void* inbuffer, float* outbuffer, long frames)
  {
! 	long* in = (int*)inbuffer;
  	while (frames--)
  	{
--- 654,660 ----
  }
  
! void Int24tofloat32(void* inbuffer, float* outbuffer, long frames)
  {
! 	int* in = (int*)inbuffer;
  	while (frames--)
  	{